summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configs/fedora/generic/arm/CONFIG_NET_VENDOR_QLOGIC1
-rw-r--r--kernel-aarch64-debug.config2
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel.spec3
8 files changed, 9 insertions, 7 deletions
diff --git a/configs/fedora/generic/arm/CONFIG_NET_VENDOR_QLOGIC b/configs/fedora/generic/arm/CONFIG_NET_VENDOR_QLOGIC
deleted file mode 100644
index 700f6a5e2..000000000
--- a/configs/fedora/generic/arm/CONFIG_NET_VENDOR_QLOGIC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_QLOGIC is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 20c512921..991613844 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3649,7 +3649,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NET_VENDOR_NETRONOME=y
CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_NET_VENDOR_OKI=y
-# CONFIG_NET_VENDOR_QLOGIC is not set
+CONFIG_NET_VENDOR_QLOGIC=y
CONFIG_NET_VENDOR_QUALCOMM=y
CONFIG_NET_VENDOR_RDC=y
CONFIG_NET_VENDOR_REALTEK=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index cf3c0789b..781388eb9 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3627,7 +3627,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NET_VENDOR_NETRONOME=y
CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_NET_VENDOR_OKI=y
-# CONFIG_NET_VENDOR_QLOGIC is not set
+CONFIG_NET_VENDOR_QLOGIC=y
CONFIG_NET_VENDOR_QUALCOMM=y
CONFIG_NET_VENDOR_RDC=y
CONFIG_NET_VENDOR_REALTEK=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 493d84904..deda30075 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3881,7 +3881,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NET_VENDOR_NETRONOME=y
CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_NET_VENDOR_OKI=y
-# CONFIG_NET_VENDOR_QLOGIC is not set
+CONFIG_NET_VENDOR_QLOGIC=y
# CONFIG_NET_VENDOR_QUALCOMM is not set
CONFIG_NET_VENDOR_RDC=y
CONFIG_NET_VENDOR_REALTEK=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index da271bb74..8c296d8e8 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3704,7 +3704,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NET_VENDOR_NETRONOME=y
CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_NET_VENDOR_OKI=y
-# CONFIG_NET_VENDOR_QLOGIC is not set
+CONFIG_NET_VENDOR_QLOGIC=y
# CONFIG_NET_VENDOR_QUALCOMM is not set
CONFIG_NET_VENDOR_RDC=y
CONFIG_NET_VENDOR_REALTEK=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index e57bc9f2f..40374d321 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3682,7 +3682,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NET_VENDOR_NETRONOME=y
CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_NET_VENDOR_OKI=y
-# CONFIG_NET_VENDOR_QLOGIC is not set
+CONFIG_NET_VENDOR_QLOGIC=y
# CONFIG_NET_VENDOR_QUALCOMM is not set
CONFIG_NET_VENDOR_RDC=y
CONFIG_NET_VENDOR_REALTEK=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 61ca2c24d..08923056e 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3859,7 +3859,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NET_VENDOR_NETRONOME=y
CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_NET_VENDOR_OKI=y
-# CONFIG_NET_VENDOR_QLOGIC is not set
+CONFIG_NET_VENDOR_QLOGIC=y
# CONFIG_NET_VENDOR_QUALCOMM is not set
CONFIG_NET_VENDOR_RDC=y
CONFIG_NET_VENDOR_REALTEK=y
diff --git a/kernel.spec b/kernel.spec
index 88f90cf30..a810a4f91 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1920,6 +1920,9 @@ fi
#
#
%changelog
+* Fri Apr 27 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable QLogic NICs on ARM
+
* Wed Apr 25 2018 Jeremy Cline <jeremy@jcline.org>
- Fix a kernel oops when using Thunderbolt 3 docks (rhbz 1565131)