[kernel] Enable Orinoco drivers in kernel-modules-extra (rhbz 894069)

[Josh Boyer]

commit d30a701642b232a62a0c80cb8c74019c587bc4e0
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Mon Jan 14 13:57:30 2013 -0500

    Enable Orinoco drivers in kernel-modules-extra (rhbz 894069)

 config-generic |   11 ++++++++++-
 kernel.spec    |    5 ++++-
 mod-extra.list |    6 ++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/config-generic b/config-generic
index eadeabd..86bb9d7 100644
--- a/config-generic
+++ b/config-generic
@@ -1551,7 +1551,16 @@ CONFIG_BRCMFMAC_USB=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMISCAN is not set
 # CONFIG_BRCMDBG is not set
-# CONFIG_HERMES is not set
+CONFIG_HERMES=m
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+# CONFIG_HERMES_PRISM is not set
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_ORINOCO_USB=m
+# CONFIG_TMD_HERMES is not set
+# CONFIG_PCMCIA_SPECTRUM is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
diff --git a/kernel.spec b/kernel.spec
index 8ae40f7..49e00aa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2296,6 +2296,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Jan 14 2013 Josh Boyer <jwboyer at redhat.com>
+- Enable Orinoco drivers in kernel-modules-extra (rhbz 894069)
+
 * Mon Jan 14 2013 Justin M. Forbes <jforbes at redhat.com> - 3.8.0-0.rc3.git1.1
 - Linux v3.8-rc3-74-gb719f43
 
diff --git a/mod-extra.list b/mod-extra.list
index 124d74e..53f8c36 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -188,3 +188,9 @@ w1_ds2431.ko
 w1_ds2423.ko
 w1_bq27000.ko
 ubifs.ko
+orinoco.ko
+orinoco_cs.ko
+orinoco_plx.ko
+orinoco_pci.ko
+orinoco_nortel.ko
+orinoco_usb.ko