From 6edaa7c42fa496c4258acc6b81584c16aa808656 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 8 Mar 2017 10:56:57 -0600 Subject: [PATCH] Turn on NET_VENDOR_SOLARFLARE to enable SFC devices again --- baseconfig/x86/CONFIG_NET_VENDOR_SOLARFLARE | 1 + kernel-i686-PAE.config | 2 +- kernel-i686-PAEdebug.config | 2 +- kernel-i686-debug.config | 2 +- kernel-i686.config | 2 +- kernel-x86_64-debug.config | 2 +- kernel-x86_64.config | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 baseconfig/x86/CONFIG_NET_VENDOR_SOLARFLARE diff --git a/baseconfig/x86/CONFIG_NET_VENDOR_SOLARFLARE b/baseconfig/x86/CONFIG_NET_VENDOR_SOLARFLARE new file mode 100644 index 000000000..8b1f0b6bf --- /dev/null +++ b/baseconfig/x86/CONFIG_NET_VENDOR_SOLARFLARE @@ -0,0 +1 @@ +CONFIG_NET_VENDOR_SOLARFLARE=y diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 18df8a891..477ebedc7 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -3328,7 +3328,7 @@ CONFIG_NET_VENDOR_ROCKER=y CONFIG_NET_VENDOR_SILAN=y CONFIG_NET_VENDOR_SIS=y CONFIG_NET_VENDOR_SMSC=y -# CONFIG_NET_VENDOR_SOLARFLARE is not set +CONFIG_NET_VENDOR_SOLARFLARE=y CONFIG_NET_VENDOR_STMICRO=y CONFIG_NET_VENDOR_SUN=y # CONFIG_NET_VENDOR_SYNOPSYS is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index e9ed6473a..9b316ee62 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -3347,7 +3347,7 @@ CONFIG_NET_VENDOR_ROCKER=y CONFIG_NET_VENDOR_SILAN=y CONFIG_NET_VENDOR_SIS=y CONFIG_NET_VENDOR_SMSC=y -# CONFIG_NET_VENDOR_SOLARFLARE is not set +CONFIG_NET_VENDOR_SOLARFLARE=y CONFIG_NET_VENDOR_STMICRO=y CONFIG_NET_VENDOR_SUN=y # CONFIG_NET_VENDOR_SYNOPSYS is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 256ae71cc..ca49b6d5d 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -3347,7 +3347,7 @@ CONFIG_NET_VENDOR_ROCKER=y CONFIG_NET_VENDOR_SILAN=y CONFIG_NET_VENDOR_SIS=y CONFIG_NET_VENDOR_SMSC=y -# CONFIG_NET_VENDOR_SOLARFLARE is not set +CONFIG_NET_VENDOR_SOLARFLARE=y CONFIG_NET_VENDOR_STMICRO=y CONFIG_NET_VENDOR_SUN=y # CONFIG_NET_VENDOR_SYNOPSYS is not set diff --git a/kernel-i686.config b/kernel-i686.config index 4179071a8..c9ffb0272 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -3328,7 +3328,7 @@ CONFIG_NET_VENDOR_ROCKER=y CONFIG_NET_VENDOR_SILAN=y CONFIG_NET_VENDOR_SIS=y CONFIG_NET_VENDOR_SMSC=y -# CONFIG_NET_VENDOR_SOLARFLARE is not set +CONFIG_NET_VENDOR_SOLARFLARE=y CONFIG_NET_VENDOR_STMICRO=y CONFIG_NET_VENDOR_SUN=y # CONFIG_NET_VENDOR_SYNOPSYS is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 6aebebd8f..f00a23b9d 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -3369,7 +3369,7 @@ CONFIG_NET_VENDOR_ROCKER=y CONFIG_NET_VENDOR_SILAN=y CONFIG_NET_VENDOR_SIS=y CONFIG_NET_VENDOR_SMSC=y -# CONFIG_NET_VENDOR_SOLARFLARE is not set +CONFIG_NET_VENDOR_SOLARFLARE=y CONFIG_NET_VENDOR_STMICRO=y CONFIG_NET_VENDOR_SUN=y # CONFIG_NET_VENDOR_SYNOPSYS is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index c83d20f4c..81a2dfb5d 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -3350,7 +3350,7 @@ CONFIG_NET_VENDOR_ROCKER=y CONFIG_NET_VENDOR_SILAN=y CONFIG_NET_VENDOR_SIS=y CONFIG_NET_VENDOR_SMSC=y -# CONFIG_NET_VENDOR_SOLARFLARE is not set +CONFIG_NET_VENDOR_SOLARFLARE=y CONFIG_NET_VENDOR_STMICRO=y CONFIG_NET_VENDOR_SUN=y # CONFIG_NET_VENDOR_SYNOPSYS is not set