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

[Josh Boyer]

commit 2aae8f448aba4f718508ca2c6750398b583f3623
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 e9a9307..926733e 100644
--- a/config-generic
+++ b/config-generic
@@ -1532,7 +1532,16 @@ CONFIG_BRCMFMAC_SDIO_OOB=y
 CONFIG_BRCMFMAC_USB=y
 # 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 cf9f7d5..e22c83e 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 201
+%global baserelease 202
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2396,6 +2396,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Jan 14 2013 Josh Boyer <jwboyer at redhat.com>
+- Enable Orinoco drivers in kernel-modules-extra (rhbz 894069)
+
 * Fri Jan 11 2013 Justin M. Forbes <jforbes at redhat.com> 3.7.1-1
 - Linux v3.7.2
 - Enable Intel IOMMU by default
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