Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / drivers / net / wireless / rt2x00 / Makefile

diff --git a/drivers/net/wireless/rt2x00/Makefile b/drivers/net/wireless/rt2x00/Makefile
index 30d654a42eeab77b1270dc2479df83a99e1783fb..1087dbcf1a04b2026a9acf3bc1713b849219d1fd 100644 (file)
--- a/drivers/net/wireless/rt2x00/Makefile
+++ b/drivers/net/wireless/rt2x00/Makefile
@@ -1,22 +1,17 @@
-rt2x00lib-objs := rt2x00dev.o rt2x00mac.o rt2x00config.o
+rt2x00lib-y                            += rt2x00dev.o
+rt2x00lib-y                            += rt2x00mac.o
+rt2x00lib-y                            += rt2x00config.o
+rt2x00lib-y                            += rt2x00queue.o
+rt2x00lib-$(CONFIG_RT2X00_LIB_DEBUGFS) += rt2x00debug.o
+rt2x00lib-$(CONFIG_RT2X00_LIB_RFKILL)  += rt2x00rfkill.o
+rt2x00lib-$(CONFIG_RT2X00_LIB_FIRMWARE)        += rt2x00firmware.o
+rt2x00lib-$(CONFIG_RT2X00_LIB_LEDS)    += rt2x00leds.o
 
-ifeq ($(CONFIG_RT2X00_LIB_DEBUGFS),y)
-       rt2x00lib-objs += rt2x00debug.o
-endif
-
-ifeq ($(CONFIG_RT2X00_LIB_RFKILL),y)
-       rt2x00lib-objs += rt2x00rfkill.o
-endif
-
-ifeq ($(CONFIG_RT2X00_LIB_FIRMWARE),y)
-       rt2x00lib-objs += rt2x00firmware.o
-endif
-
-obj-$(CONFIG_RT2X00_LIB)       += rt2x00lib.o
-obj-$(CONFIG_RT2X00_LIB_PCI)   += rt2x00pci.o
-obj-$(CONFIG_RT2X00_LIB_USB)   += rt2x00usb.o
-obj-$(CONFIG_RT2400PCI)                += rt2400pci.o
-obj-$(CONFIG_RT2500PCI)                += rt2500pci.o
-obj-$(CONFIG_RT61PCI)          += rt61pci.o
-obj-$(CONFIG_RT2500USB)                += rt2500usb.o
-obj-$(CONFIG_RT73USB)          += rt73usb.o
+obj-$(CONFIG_RT2X00_LIB)               += rt2x00lib.o
+obj-$(CONFIG_RT2X00_LIB_PCI)           += rt2x00pci.o
+obj-$(CONFIG_RT2X00_LIB_USB)           += rt2x00usb.o
+obj-$(CONFIG_RT2400PCI)                        += rt2400pci.o
+obj-$(CONFIG_RT2500PCI)                        += rt2500pci.o
+obj-$(CONFIG_RT61PCI)                  += rt61pci.o
+obj-$(CONFIG_RT2500USB)                        += rt2500usb.o
+obj-$(CONFIG_RT73USB)                  += rt73usb.o