Move makefile driver select options to 99-change-makefiles.patch

These hunks remove drivers which we do not support or want
to compile for compat-wireless.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/compat/compat.diff b/compat/compat.diff
index e8a16ba9680a03854691bf519648db5805d6d194..902eb4f0692ab5febc69cbdb4d3d1fd5eb55ed28 100644 (file)
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -1,84 +1,3 @@
---- a/drivers/misc/eeprom/Makefile
-+++ b/drivers/misc/eeprom/Makefile
-@@ -1,5 +1 @@
--obj-$(CONFIG_EEPROM_AT24)     += at24.o
--obj-$(CONFIG_EEPROM_AT25)     += at25.o
--obj-$(CONFIG_EEPROM_LEGACY)   += eeprom.o
--obj-$(CONFIG_EEPROM_MAX6875)  += max6875.o
- obj-$(CONFIG_EEPROM_93CX6)    += eeprom_93cx6.o
---- a/drivers/net/usb/Makefile 2009-07-27 08:03:34.770077174 -0700
-+++ b/drivers/net/usb/Makefile 2009-07-27 08:04:22.594143560 -0700
-@@ -2,24 +2,7 @@
- # Makefile for USB Network drivers
- #
- 
--obj-$(CONFIG_USB_CATC)                += catc.o
--obj-$(CONFIG_USB_KAWETH)      += kaweth.o
--obj-$(CONFIG_USB_PEGASUS)     += pegasus.o
--obj-$(CONFIG_USB_RTL8150)     += rtl8150.o
--obj-$(CONFIG_USB_HSO)         += hso.o
--obj-$(CONFIG_USB_NET_AX8817X) += asix.o
- obj-$(CONFIG_USB_NET_CDCETHER)        += cdc_ether.o
--obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o
--obj-$(CONFIG_USB_NET_DM9601)  += dm9601.o
--obj-$(CONFIG_USB_NET_SMSC95XX)        += smsc95xx.o
--obj-$(CONFIG_USB_NET_GL620A)  += gl620a.o
--obj-$(CONFIG_USB_NET_NET1080) += net1080.o
--obj-$(CONFIG_USB_NET_PLUSB)   += plusb.o
- obj-$(CONFIG_USB_NET_RNDIS_HOST)      += rndis_host.o
--obj-$(CONFIG_USB_NET_CDC_SUBSET)      += cdc_subset.o
--obj-$(CONFIG_USB_NET_ZAURUS)  += zaurus.o
--obj-$(CONFIG_USB_NET_MCS7830) += mcs7830.o
- obj-$(CONFIG_USB_USBNET)      += usbnet.o
--obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o
--obj-$(CONFIG_USB_CDC_PHONET)  += cdc-phonet.o
- 
---- a/drivers/net/wireless/Makefile    2009-07-06 12:53:07.479194884 -0700
-+++ b/drivers/net/wireless/Makefile    2009-07-06 12:54:42.026195576 -0700
-@@ -5,43 +5,16 @@
- obj-$(CONFIG_IPW2100) += ipw2x00/
- obj-$(CONFIG_IPW2200) += ipw2x00/
- 
--obj-$(CONFIG_STRIP) += strip.o
--obj-$(CONFIG_ARLAN) += arlan.o 
--
--arlan-objs := arlan-main.o arlan-proc.o
--
--# Obsolete cards
--obj-$(CONFIG_WAVELAN)         += wavelan.o
--obj-$(CONFIG_PCMCIA_NETWAVE)  += netwave_cs.o
--obj-$(CONFIG_PCMCIA_WAVELAN)  += wavelan_cs.o
--
--obj-$(CONFIG_HERMES)          += orinoco/
--
--obj-$(CONFIG_AIRO)            += airo.o
--obj-$(CONFIG_AIRO_CS)         += airo_cs.o airo.o
--
--obj-$(CONFIG_ATMEL)             += atmel.o
--obj-$(CONFIG_PCI_ATMEL)         += atmel_pci.o 
--obj-$(CONFIG_PCMCIA_ATMEL)      += atmel_cs.o
--
- obj-$(CONFIG_AT76C50X_USB)      += at76c50x-usb.o
- 
--obj-$(CONFIG_PRISM54)         += prism54/
--
--obj-$(CONFIG_HOSTAP)          += hostap/
- obj-$(CONFIG_B43)             += b43/
- obj-$(CONFIG_B43LEGACY)               += b43legacy/
- obj-$(CONFIG_ZD1211RW)                += zd1211rw/
- obj-$(CONFIG_RTL8180)         += rtl818x/
- obj-$(CONFIG_RTL8187)         += rtl818x/
- 
--# 16-bit wireless PCMCIA client drivers
--obj-$(CONFIG_PCMCIA_RAYCS)    += ray_cs.o
--obj-$(CONFIG_PCMCIA_WL3501)   += wl3501_cs.o
--
- obj-$(CONFIG_USB_NET_RNDIS_WLAN)      += rndis_wlan.o
- 
--obj-$(CONFIG_USB_ZD1201)      += zd1201.o
- obj-$(CONFIG_LIBERTAS)                += libertas/
- 
- obj-$(CONFIG_LIBERTAS_THINFIRM)       += libertas_tf/
 --- a/drivers/net/wireless/zd1211rw/zd_chip.h  2009-07-06 16:09:14.934197004 -0700
 +++ b/drivers/net/wireless/zd1211rw/zd_chip.h  2009-07-06 16:10:01.570226234 -0700
 @@ -897,9 +897,9 @@

diff --git a/compat/diffs/99-change-makefiles.patch b/compat/diffs/99-change-makefiles.patch
new file mode 100644 (file)
index 0000000..ea8467f
--- /dev/null
+++ b/compat/diffs/99-change-makefiles.patch
@@ -0,0 +1,81 @@
+--- a/drivers/misc/eeprom/Makefile
++++ b/drivers/misc/eeprom/Makefile
+@@ -1,5 +1 @@
+-obj-$(CONFIG_EEPROM_AT24)     += at24.o
+-obj-$(CONFIG_EEPROM_AT25)     += at25.o
+-obj-$(CONFIG_EEPROM_LEGACY)   += eeprom.o
+-obj-$(CONFIG_EEPROM_MAX6875)  += max6875.o
+ obj-$(CONFIG_EEPROM_93CX6)    += eeprom_93cx6.o
+--- a/drivers/net/usb/Makefile 2009-07-27 08:03:34.770077174 -0700
++++ b/drivers/net/usb/Makefile 2009-07-27 08:04:22.594143560 -0700
+@@ -2,24 +2,7 @@
+ # Makefile for USB Network drivers
+ #
+ 
+-obj-$(CONFIG_USB_CATC)                += catc.o
+-obj-$(CONFIG_USB_KAWETH)      += kaweth.o
+-obj-$(CONFIG_USB_PEGASUS)     += pegasus.o
+-obj-$(CONFIG_USB_RTL8150)     += rtl8150.o
+-obj-$(CONFIG_USB_HSO)         += hso.o
+-obj-$(CONFIG_USB_NET_AX8817X) += asix.o
+ obj-$(CONFIG_USB_NET_CDCETHER)        += cdc_ether.o
+-obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o
+-obj-$(CONFIG_USB_NET_DM9601)  += dm9601.o
+-obj-$(CONFIG_USB_NET_SMSC95XX)        += smsc95xx.o
+-obj-$(CONFIG_USB_NET_GL620A)  += gl620a.o
+-obj-$(CONFIG_USB_NET_NET1080) += net1080.o
+-obj-$(CONFIG_USB_NET_PLUSB)   += plusb.o
+ obj-$(CONFIG_USB_NET_RNDIS_HOST)      += rndis_host.o
+-obj-$(CONFIG_USB_NET_CDC_SUBSET)      += cdc_subset.o
+-obj-$(CONFIG_USB_NET_ZAURUS)  += zaurus.o
+-obj-$(CONFIG_USB_NET_MCS7830) += mcs7830.o
+ obj-$(CONFIG_USB_USBNET)      += usbnet.o
+-obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o
+-obj-$(CONFIG_USB_CDC_PHONET)  += cdc-phonet.o
+ 
+--- a/drivers/net/wireless/Makefile    2009-07-06 12:53:07.479194884 -0700
++++ b/drivers/net/wireless/Makefile    2009-07-06 12:54:42.026195576 -0700
+@@ -5,43 +5,16 @@
+ obj-$(CONFIG_IPW2100) += ipw2x00/
+ obj-$(CONFIG_IPW2200) += ipw2x00/
+ 
+-obj-$(CONFIG_STRIP) += strip.o
+-obj-$(CONFIG_ARLAN) += arlan.o 
+-
+-arlan-objs := arlan-main.o arlan-proc.o
+-
+-# Obsolete cards
+-obj-$(CONFIG_WAVELAN)         += wavelan.o
+-obj-$(CONFIG_PCMCIA_NETWAVE)  += netwave_cs.o
+-obj-$(CONFIG_PCMCIA_WAVELAN)  += wavelan_cs.o
+-
+-obj-$(CONFIG_HERMES)          += orinoco/
+-
+-obj-$(CONFIG_AIRO)            += airo.o
+-obj-$(CONFIG_AIRO_CS)         += airo_cs.o airo.o
+-
+-obj-$(CONFIG_ATMEL)             += atmel.o
+-obj-$(CONFIG_PCI_ATMEL)         += atmel_pci.o 
+-obj-$(CONFIG_PCMCIA_ATMEL)      += atmel_cs.o
+-
+ obj-$(CONFIG_AT76C50X_USB)      += at76c50x-usb.o
+ 
+-obj-$(CONFIG_PRISM54)         += prism54/
+-
+-obj-$(CONFIG_HOSTAP)          += hostap/
+ obj-$(CONFIG_B43)             += b43/
+ obj-$(CONFIG_B43LEGACY)               += b43legacy/
+ obj-$(CONFIG_ZD1211RW)                += zd1211rw/
+ obj-$(CONFIG_RTL8180)         += rtl818x/
+ obj-$(CONFIG_RTL8187)         += rtl818x/
+ 
+-# 16-bit wireless PCMCIA client drivers
+-obj-$(CONFIG_PCMCIA_RAYCS)    += ray_cs.o
+-obj-$(CONFIG_PCMCIA_WL3501)   += wl3501_cs.o
+-
+ obj-$(CONFIG_USB_NET_RNDIS_WLAN)      += rndis_wlan.o
+ 
+-obj-$(CONFIG_USB_ZD1201)      += zd1201.o
+ obj-$(CONFIG_LIBERTAS)                += libertas/
+ 
+ obj-$(CONFIG_LIBERTAS_THINFIRM)       += libertas_tf/