[kernel/f16] Re-enable CONFIG_RT2800PCI_RT53XX in compat-wireless build (rhbz #720594)

[John W. Linville]

commit cd152b3a6c81dfe2987bb456c6c135da616ba329
Author: John W. Linville <linville at tuxdriver.com>
Date:   Tue Jan 3 09:49:11 2012 -0500

    Re-enable CONFIG_RT2800PCI_RT53XX in compat-wireless build (rhbz #720594)

 compat-wireless-config-fixups.patch |   48 ++++++++++++++++++++++++-----------
 kernel.spec                         |    3 ++
 2 files changed, 36 insertions(+), 15 deletions(-)
---
diff --git a/compat-wireless-config-fixups.patch b/compat-wireless-config-fixups.patch
index 411ee40..15566c3 100644
--- a/compat-wireless-config-fixups.patch
+++ b/compat-wireless-config-fixups.patch
@@ -1,6 +1,6 @@
-diff -up compat-wireless-3.2-rc1-1/config.mk.orig compat-wireless-3.2-rc1-1/config.mk
---- compat-wireless-3.2-rc1-1/config.mk.orig	2011-11-22 13:09:50.422879313 -0500
-+++ compat-wireless-3.2-rc1-1/config.mk	2011-11-22 13:10:28.870398679 -0500
+diff -up compat-wireless-3.2-rc6-3/config.mk.orig compat-wireless-3.2-rc6-3/config.mk
+--- compat-wireless-3.2-rc6-3/config.mk.orig	2012-01-03 09:41:57.090827042 -0500
++++ compat-wireless-3.2-rc6-3/config.mk	2012-01-03 09:42:19.259549896 -0500
 @@ -14,6 +14,9 @@ else
  include $(KLIB_BUILD)/.config
  endif
@@ -11,17 +11,35 @@ diff -up compat-wireless-3.2-rc1-1/config.mk.orig compat-wireless-3.2-rc1-1/conf
  ifneq ($(wildcard $(KLIB_BUILD)/Makefile),)
  
  COMPAT_LATEST_VERSION = 1
-diff -up compat-wireless-3.2-rc1-1/drivers/misc/eeprom/Makefile.orig compat-wireless-3.2-rc1-1/drivers/misc/eeprom/Makefile
---- compat-wireless-3.2-rc1-1/drivers/misc/eeprom/Makefile.orig	2011-11-22 13:09:50.423879301 -0500
-+++ compat-wireless-3.2-rc1-1/drivers/misc/eeprom/Makefile	2011-11-22 13:10:28.871398662 -0500
+@@ -353,7 +356,7 @@ ifdef CONFIG_CRC_CCITT
+ CONFIG_RT2800PCI=m
+ CONFIG_RT2800PCI_RT33XX=y
+ CONFIG_RT2800PCI_RT35XX=y
+-# CONFIG_RT2800PCI_RT53XX=y
++CONFIG_RT2800PCI_RT53XX=y
+ endif #CONFIG_CRC_CCITT
+ NEED_RT2X00=y
+ 
+@@ -481,7 +484,7 @@ ifdef CONFIG_CRC_CCITT
+ CONFIG_RT2800USB=m
+ CONFIG_RT2800USB_RT33XX=y
+ CONFIG_RT2800USB_RT35XX=y
+-# CONFIG_RT2800USB_RT53XX=y
++CONFIG_RT2800USB_RT53XX=y
+ CONFIG_RT2800USB_UNKNOWN=y
+ endif #CONFIG_CRC_CCITT
+ CONFIG_RT2X00_LIB_USB=m
+diff -up compat-wireless-3.2-rc6-3/drivers/misc/eeprom/Makefile.orig compat-wireless-3.2-rc6-3/drivers/misc/eeprom/Makefile
+--- compat-wireless-3.2-rc6-3/drivers/misc/eeprom/Makefile.orig	2012-01-03 09:41:57.104826867 -0500
++++ compat-wireless-3.2-rc6-3/drivers/misc/eeprom/Makefile	2012-01-03 09:42:03.468747311 -0500
 @@ -1,3 +1,3 @@
 -obj-$(CONFIG_EEPROM_93CX6)	+= eeprom_93cx6.o
 +#obj-$(CONFIG_EEPROM_93CX6)	+= eeprom_93cx6.o
  obj-$(CONFIG_EEPROM_93XX46)	+= eeprom_93xx46.o
  obj-$(CONFIG_EEPROM_DIGSY_MTC_CFG) += digsy_mtc_eeprom.o
-diff -up compat-wireless-3.2-rc1-1/drivers/net/ethernet/atheros/Makefile.orig compat-wireless-3.2-rc1-1/drivers/net/ethernet/atheros/Makefile
---- compat-wireless-3.2-rc1-1/drivers/net/ethernet/atheros/Makefile.orig	2011-11-22 13:09:50.423879301 -0500
-+++ compat-wireless-3.2-rc1-1/drivers/net/ethernet/atheros/Makefile	2011-11-22 13:10:28.871398662 -0500
+diff -up compat-wireless-3.2-rc6-3/drivers/net/ethernet/atheros/Makefile.orig compat-wireless-3.2-rc6-3/drivers/net/ethernet/atheros/Makefile
+--- compat-wireless-3.2-rc6-3/drivers/net/ethernet/atheros/Makefile.orig	2012-01-03 09:41:57.107826831 -0500
++++ compat-wireless-3.2-rc6-3/drivers/net/ethernet/atheros/Makefile	2012-01-03 09:42:03.469747299 -0500
 @@ -2,7 +2,7 @@
  # Makefile for the Atheros network device drivers.
  #
@@ -34,9 +52,9 @@ diff -up compat-wireless-3.2-rc1-1/drivers/net/ethernet/atheros/Makefile.orig co
 +#obj-$(CONFIG_ATL2) += atlx/
 +#obj-$(CONFIG_ATL1E) += atl1e/
 +#obj-$(CONFIG_ATL1C) += atl1c/
-diff -up compat-wireless-3.2-rc1-1/drivers/net/usb/Makefile.orig compat-wireless-3.2-rc1-1/drivers/net/usb/Makefile
---- compat-wireless-3.2-rc1-1/drivers/net/usb/Makefile.orig	2011-11-22 13:09:50.424879289 -0500
-+++ compat-wireless-3.2-rc1-1/drivers/net/usb/Makefile	2011-11-22 13:10:28.872398646 -0500
+diff -up compat-wireless-3.2-rc6-3/drivers/net/usb/Makefile.orig compat-wireless-3.2-rc6-3/drivers/net/usb/Makefile
+--- compat-wireless-3.2-rc6-3/drivers/net/usb/Makefile.orig	2012-01-03 09:41:57.108826819 -0500
++++ compat-wireless-3.2-rc6-3/drivers/net/usb/Makefile	2012-01-03 09:42:03.469747299 -0500
 @@ -2,7 +2,7 @@
  # Makefile for USB Network drivers
  #
@@ -48,9 +66,9 @@ diff -up compat-wireless-3.2-rc1-1/drivers/net/usb/Makefile.orig compat-wireless
 +#obj-$(CONFIG_USB_NET_COMPAT_RNDIS_HOST)	+= rndis_host.o
 +#obj-$(CONFIG_USB_COMPAT_USBNET)	+= usbnet.o
  
-diff -up compat-wireless-3.2-rc1-1/Makefile.orig compat-wireless-3.2-rc1-1/Makefile
---- compat-wireless-3.2-rc1-1/Makefile.orig	2011-11-22 13:10:37.165294951 -0500
-+++ compat-wireless-3.2-rc1-1/Makefile	2011-11-22 13:10:47.335167758 -0500
+diff -up compat-wireless-3.2-rc6-3/Makefile.orig compat-wireless-3.2-rc6-3/Makefile
+--- compat-wireless-3.2-rc6-3/Makefile.orig	2012-01-03 09:41:57.109826807 -0500
++++ compat-wireless-3.2-rc6-3/Makefile	2012-01-03 09:42:03.470747287 -0500
 @@ -41,8 +41,8 @@ endif
  
  endif
diff --git a/kernel.spec b/kernel.spec
index 7ce7f0f..ed65792 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2352,6 +2352,9 @@ fi
 # and build.
 
 %changelog
+* Tue Jan  3 2012 John W. Linville <linville at redhat.com> 
+- Re-enable CONFIG_RT2800PCI_RT53XX in compat-wireless build (rhbz #720594)
+
 * Thu Dec 29 2011 Dave Jones <davej at redhat.com> 3.1.6-2
 - Create a blacklist for pci=nocrs
   Add Dell Studio 1536 to it.