diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-30 13:51:29 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-30 13:51:29 -0800 |
commit | 3a999e6eb5d277cd6a321dcda3fc43c3d9e4e4b8 (patch) | |
tree | b0ad8d03710ee556e97515ba1c949233859391ce /drivers/net/wireless/b43/Makefile | |
parent | 6cd9b49d7328c4656bfc17fcb47fb814955d40d2 (diff) | |
parent | 891dc5e73783eeabd2a704a9425e2a199b39c9f9 (diff) | |
download | blackbird-op-linux-3a999e6eb5d277cd6a321dcda3fc43c3d9e4e4b8.tar.gz blackbird-op-linux-3a999e6eb5d277cd6a321dcda3fc43c3d9e4e4b8.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43/Makefile')
-rw-r--r-- | drivers/net/wireless/b43/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/Makefile b/drivers/net/wireless/b43/Makefile index 84772a2542dc..5e83b6f0a3a0 100644 --- a/drivers/net/wireless/b43/Makefile +++ b/drivers/net/wireless/b43/Makefile @@ -12,7 +12,7 @@ b43-y += xmit.o b43-y += lo.o b43-y += wa.o b43-y += dma.o -b43-$(CONFIG_B43_PIO) += pio.o +b43-y += pio.o b43-y += rfkill.o b43-$(CONFIG_B43_LEDS) += leds.o b43-$(CONFIG_B43_PCMCIA) += pcmcia.o |