summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/b43/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-12 13:32:17 +0400
committerIngo Molnar <mingo@elte.hu>2008-10-12 13:32:17 +0400
commit206855c321adee56db3946ca09a5887cddb9d598 (patch)
tree13a2729d4d0e37170552bd9ad3c6bba71ba0c55c /drivers/net/wireless/b43/Makefile
parente8d3f455de4f42d4bab2f6f1aeb2cf3bd18eb508 (diff)
parentcb58ffc3889f0545628f138f849e759a331b8ddc (diff)
downloadlinux-206855c321adee56db3946ca09a5887cddb9d598.tar.xz
Merge branch 'x86/urgent' into core/signal
Conflicts: arch/x86/kernel/signal_64.c
Diffstat (limited to 'drivers/net/wireless/b43/Makefile')
-rw-r--r--drivers/net/wireless/b43/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/Makefile b/drivers/net/wireless/b43/Makefile
index 8c52b0b9862a..14a02b3aea53 100644
--- a/drivers/net/wireless/b43/Makefile
+++ b/drivers/net/wireless/b43/Makefile
@@ -1,8 +1,11 @@
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 += phy_common.o
+b43-y += phy_g.o
+b43-y += phy_a.o
+b43-$(CONFIG_B43_NPHY) += phy_n.o
+b43-$(CONFIG_B43_PHY_LP) += phy_lp.o
b43-y += sysfs.o
b43-y += xmit.o
b43-y += lo.o