summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-07-16 17:43:32 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-07-16 17:45:17 -0400
commite54319590ac56b002c6a191a204a5db4691332f1 (patch)
tree1ca8f2518255f11a22ce136fdccc48ea33cb6e48
parent84093725a96aeaa5ca6db283dc59372ff346592b (diff)
downloadkernel-e54319590ac56b002c6a191a204a5db4691332f1.tar.gz
kernel-e54319590ac56b002c6a191a204a5db4691332f1.tar.xz
kernel-e54319590ac56b002c6a191a204a5db4691332f1.zip
Enable hermes prism driver (rhbz 1120393)
-rw-r--r--config-generic2
-rw-r--r--kernel.spec3
2 files changed, 4 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index c6adc57dd..cb3787b1b 100644
--- a/config-generic
+++ b/config-generic
@@ -1718,7 +1718,7 @@ CONFIG_BRCMFMAC_USB=y
# CONFIG_SYSTEMPORT is not set
CONFIG_HERMES=m
CONFIG_HERMES_CACHE_FW_ON_INIT=y
-# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_PRISM=y
CONFIG_NORTEL_HERMES=m
CONFIG_PCI_HERMES=m
CONFIG_PLX_HERMES=m
diff --git a/kernel.spec b/kernel.spec
index 0ad7c1aa8..8602362e9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2246,6 +2246,9 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Jul 16 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable hermes prism driver (rhbz 1120393)
+
* Wed Jul 16 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.16.0-0.rc5.git1.1
- Linux v3.16-rc5-130-g2da294474093
- Reenable debugging options.