Accomodate orinoco directory changes in drivers/net/wireless/Makefile.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/compat/compat.diff b/compat/compat.diff
index 7ea7d570ae270a233f20b8c4c75731022178c384..dfb8486e50e4fcbee3f874425c19931e59e84961 100644 (file)
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -107,55 +107,6 @@
 -obj-$(CONFIG_USB_NET_MCS7830) += mcs7830.o
  obj-$(CONFIG_USB_USBNET)      += usbnet.o
  
---- a/drivers/net/wireless/Makefile    2008-10-15 12:19:31.000000000 -0600
-+++ b/drivers/net/wireless/Makefile    2008-10-15 12:24:13.000000000 -0600
-@@ -6,46 +6,12 @@
- 
- obj-$(CONFIG_IPW2200) += ipw2200.o
- 
--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.o hermes.o hermes_dld.o
--obj-$(CONFIG_PCMCIA_HERMES)   += orinoco_cs.o
--obj-$(CONFIG_APPLE_AIRPORT)   += airport.o
--obj-$(CONFIG_PLX_HERMES)      += orinoco_plx.o
--obj-$(CONFIG_PCI_HERMES)      += orinoco_pci.o
--obj-$(CONFIG_TMD_HERMES)      += orinoco_tmd.o
--obj-$(CONFIG_NORTEL_HERMES)   += orinoco_nortel.o
--obj-$(CONFIG_PCMCIA_SPECTRUM) += spectrum_cs.o
--
--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_PRISM54)         += prism54/
--
--obj-$(CONFIG_HOSTAP)          += hostap/
- obj-$(CONFIG_B43)             += b43/
- obj-$(CONFIG_B43LEGACY)               += b43legacy/
- obj-$(CONFIG_ZD1211RW)                += zd1211rw/
- 
--# 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/
 diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
 index 3cfc303..33c76b0 100644
 --- a/drivers/net/wireless/b43/pcmcia.c
@@ -260,3 +211,47 @@ index a0c860f..9c6f214 100644
  
        /* Now we know the 1d priority, fill in the QoS header if
         * there is one.
+diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
+index 7882084..e65e8b4 100644
+--- a/drivers/net/wireless/Makefile
++++ b/drivers/net/wireless/Makefile
+@@ -6,39 +6,12 @@ obj-$(CONFIG_IPW2100) += ipw2100.o
+ 
+ obj-$(CONFIG_IPW2200) += ipw2200.o
+ 
+-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_PRISM54)         += prism54/
+-
+-obj-$(CONFIG_HOSTAP)          += hostap/
+ obj-$(CONFIG_B43)             += b43/
+ obj-$(CONFIG_B43LEGACY)               += b43legacy/
+ obj-$(CONFIG_ZD1211RW)                += zd1211rw/
+ 
+-# 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/