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 +- Enable hermes prism driver (rhbz 1120393) + * Wed Jul 16 2014 Josh Boyer - 3.16.0-0.rc5.git1.1 - Linux v3.16-rc5-130-g2da294474093 - Reenable debugging options.