[kernel/f21] Enable hermes prism driver (rhbz 1120393)

[Josh Boyer]

commit b8207bb9c872b5a129747a1e64dff488394b1715
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Wed Jul 16 17:43:32 2014 -0400

    Enable hermes prism driver (rhbz 1120393)

 config-generic |    2 +-
 kernel.spec    |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/config-generic b/config-generic
index c6adc57..cb3787b 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 0ad7c1a..8602362 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2246,6 +2246,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Wed Jul 16 2014 Josh Boyer <jwboyer at fedoraproject.org>
+- Enable hermes prism driver (rhbz 1120393)
+
 * Wed Jul 16 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.16.0-0.rc5.git1.1
 - Linux v3.16-rc5-130-g2da294474093
 - Reenable debugging options.