John W. Linville 4bdb0fba9e rt61pci: fix-up merge damage ...

A subtle merge error was introduced after re-queueing a patch for 2.6.24
instead of 2.6.25...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2008-01-31 19:26:33 -08:00

..

Kconfig

…

Makefile

…

rt2x00.h

mac80211: add unified BSS configuration

2008-01-28 15:09:43 -08:00

rt2x00config.c

rt2x00: Replace DRV_NAME with KBUILD_MODNAME

2008-01-28 15:05:04 -08:00

rt2x00debug.c

rt2x00: Store queue idx and entry idx in data_ring and data_entry

2008-01-28 15:09:24 -08:00

rt2x00debug.h

…

rt2x00dev.c

rt2x00: Fix queue_idx initialization

2008-01-28 15:09:48 -08:00

rt2x00dump.h

rt2x00: Add TX/RX frame dumping facility

2008-01-28 15:05:08 -08:00

rt2x00firmware.c

rt2x00: Replace DRV_NAME with KBUILD_MODNAME

2008-01-28 15:05:04 -08:00

rt2x00lib.h

rt2x00: Move start() and stop() handlers into rt2x00lib.c

2008-01-28 15:09:24 -08:00

rt2x00mac.c

mac80211: add unified BSS configuration

2008-01-28 15:09:43 -08:00

rt2x00pci.c

rt2x00: Always call ieee80211_stop_queue() when return NETDEV_TX_BUSY

2008-01-28 15:09:22 -08:00

rt2x00pci.h

…

rt2x00reg.h

…

rt2x00rfkill.c

rt2x00: Cleanup rfkill

2008-01-28 15:05:11 -08:00

rt2x00ring.h

rt2x00: Determine MY_BSS from descriptor

2008-01-28 15:09:27 -08:00

rt2x00usb.c

drivers/net/wireless/rt2x00/rt2x00usb.c: fix uninitialized var warning

2008-01-28 15:10:12 -08:00

rt2x00usb.h

rt2x00: Move init_txring and init_rxring into rt2x00lib

2008-01-28 15:09:27 -08:00

rt61pci.c

rt61pci: fix-up merge damage

2008-01-31 19:26:33 -08:00

rt61pci.h

…

rt73usb.c

rt2x00: Data and desc pointer initialization

2008-01-28 15:09:47 -08:00

rt73usb.h

…

rt2400pci.c

mac80211: add unified BSS configuration

2008-01-28 15:09:43 -08:00

rt2400pci.h

rt2x00: Extend PLCP descriptor definition for rt2400pci

2008-01-28 15:05:05 -08:00

rt2500pci.c

mac80211: add unified BSS configuration

2008-01-28 15:09:43 -08:00

rt2500pci.h

…

rt2500usb.c

rt2x00: Data and desc pointer initialization

2008-01-28 15:09:47 -08:00

rt2500usb.h

…