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

[Josh Boyer]

commit 719e3cadbe53e3117967bd9d4d9ab2c47f6c9750
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 6c3b227..a7098d4 100644
--- a/config-generic
+++ b/config-generic
@@ -1710,7 +1710,7 @@ CONFIG_BRCMFMAC_USB=y
 # CONFIG_BRCMDBG 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 c1442a7..c9257f3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2272,6 +2272,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Wed Jul 16 2014 Josh Boyer <jwboyer at fedoraproject.org>
+- Enable hermes prism driver (rhbz 1120393)
+
 * Mon Jul 14 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.15.5-200
 - Linux v3.15.5
 - Fix i915 regression with external monitors (rhbz 1117008)