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

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / b43legacy / Makefile

diff --git a/drivers/net/wireless/b43legacy/Makefile b/drivers/net/wireless/b43legacy/Makefile
index ec3a2482bbad26d922ba7f360401001548fe4cef..80cdb73bd140c4b42a37d464ce8f676211c5f612 100644 (file)
--- a/drivers/net/wireless/b43legacy/Makefile
+++ b/drivers/net/wireless/b43legacy/Makefile
@@ -1,14 +1,19 @@
-obj-$(CONFIG_B43LEGACY) += b43legacy.o
-b43legacy-obj-$(CONFIG_B43LEGACY_DEBUG) += debugfs.o
+# b43legacy core
+b43legacy-y                            += main.o
+b43legacy-y                            += ilt.o
+b43legacy-y                            += phy.o
+b43legacy-y                            += radio.o
+b43legacy-y                            += sysfs.o
+b43legacy-y                            += xmit.o
+# b43 RFKILL button support
+b43legacy-$(CONFIG_B43LEGACY_RFKILL)   += rfkill.o
+# b43legacy LED support
+b43legacy-$(CONFIG_B43LEGACY_LEDS)     += leds.o
+# b43legacy debugging
+b43legacy-$(CONFIG_B43LEGACY_DEBUG)    += debugfs.o
+# b43legacy DMA and PIO
+b43legacy-$(CONFIG_B43LEGACY_DMA)      += dma.o
+b43legacy-$(CONFIG_B43LEGACY_PIO)      += pio.o
 
-b43legacy-obj-$(CONFIG_B43LEGACY_DMA) += dma.o
-b43legacy-obj-$(CONFIG_B43LEGACY_PIO) += pio.o
+obj-$(CONFIG_B43LEGACY)                        += b43legacy.o
 
-b43legacy-objs := main.o \
-               ilt.o \
-               leds.o \
-               phy.o \
-               radio.o \
-               sysfs.o \
-               xmit.o \
-               $(b43legacy-obj-y)