Merge branch 'linus' into cpus4096-for-linus

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

diff --git a/drivers/net/wireless/b43/Makefile b/drivers/net/wireless/b43/Makefile
index dc270474b33c802d6369c446787bef32dc72eda0..8c52b0b9862a7ac563ebc81ae8a34a71af681aeb 100644 (file)
--- a/drivers/net/wireless/b43/Makefile
+++ b/drivers/net/wireless/b43/Makefile
@@ -1,21 +1,17 @@
-# b43 core
 b43-y                          += main.o
 b43-y                          += tables.o
+b43-$(CONFIG_B43_NPHY)         += tables_nphy.o
 b43-y                          += phy.o
+b43-$(CONFIG_B43_NPHY)         += nphy.o
 b43-y                          += sysfs.o
 b43-y                          += xmit.o
 b43-y                          += lo.o
 b43-y                          += wa.o
-# b43 RFKILL button support
+b43-y                          += dma.o
+b43-$(CONFIG_B43_PIO)          += pio.o
 b43-$(CONFIG_B43_RFKILL)       += rfkill.o
-# b43 LED support
 b43-$(CONFIG_B43_LEDS)         += leds.o
-# b43 PCMCIA support
 b43-$(CONFIG_B43_PCMCIA)       += pcmcia.o
-# b43 debugging
 b43-$(CONFIG_B43_DEBUG)                += debugfs.o
-# b43 DMA and PIO
-b43-$(CONFIG_B43_DMA)          += dma.o
-b43-$(CONFIG_B43_PIO)          += pio.o
 
 obj-$(CONFIG_B43)              += b43.o