Merge branch 'linus' into x86/xen

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

diff --git a/drivers/net/wireless/ath5k/Makefile b/drivers/net/wireless/ath5k/Makefile
index 321641f99e134d3b661dcd7c7da15235e1897856..564ecd0c5d4b71dbc7979e4b12b795f1e059be58 100644 (file)
--- a/drivers/net/wireless/ath5k/Makefile
+++ b/drivers/net/wireless/ath5k/Makefile
@@ -1,2 +1,6 @@
-ath5k-objs             = base.o hw.o regdom.o initvals.o phy.o debug.o
-obj-$(CONFIG_ATH5K)    += ath5k.o
+ath5k-y                                += base.o
+ath5k-y                                += hw.o
+ath5k-y                                += initvals.o
+ath5k-y                                += phy.o
+ath5k-$(CONFIG_ATH5K_DEBUG)    += debug.o
+obj-$(CONFIG_ATH5K)            += ath5k.o