summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2017-03-08 10:51:33 -0600
committerJustin M. Forbes <jforbes@redhat.com>2017-03-08 10:51:33 -0600
commit7ded90cb04860997fe85b295db9a314d4ee071ba (patch)
tree4efeece5298bd58cd11591e1130eda43f38c8287
parent0d27bd1c6c871b8b707cf43515ed00d9148e22c1 (diff)
downloadkernel-7ded90cb04860997fe85b295db9a314d4ee071ba.tar.gz
kernel-7ded90cb04860997fe85b295db9a314d4ee071ba.tar.xz
kernel-7ded90cb04860997fe85b295db9a314d4ee071ba.zip
Turn on NET_VENDOR_SOLARFLARE to enable SFC devices again
-rw-r--r--baseconfig/x86/CONFIG_NET_VENDOR_SOLARFLARE1
-rw-r--r--kernel-i686-PAE.config2
-rw-r--r--kernel-i686-PAEdebug.config2
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-x86_64-debug.config2
-rw-r--r--kernel-x86_64.config2
7 files changed, 7 insertions, 6 deletions
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 5c21d92cc..cba70f84c 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3360,7 +3360,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 0831e8936..1bb5ebb6c 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -3380,7 +3380,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 7af084925..952b46fee 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3380,7 +3380,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 7ba82ca41..2fa682913 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3360,7 +3360,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 97c127ecd..ca3813820 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3403,7 +3403,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 29fded28a..123b71017 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3383,7 +3383,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