Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

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

diff --git a/drivers/net/wireless/hostap/Makefile b/drivers/net/wireless/hostap/Makefile
index 087554075038a07cc90d1905797f7d2aa09be37b..fc62235bfc24c169c1a04f4e93926f7782e94dcc 100644 (file)
--- a/drivers/net/wireless/hostap/Makefile
+++ b/drivers/net/wireless/hostap/Makefile
@@ -1,7 +1,4 @@
 obj-$(CONFIG_HOSTAP) += hostap.o
-obj-$(CONFIG_HOSTAP_WEP) += hostap_crypt_wep.o
-obj-$(CONFIG_HOSTAP_TKIP) += hostap_crypt_tkip.o
-obj-$(CONFIG_HOSTAP_CCMP) += hostap_crypt_ccmp.o
 
 obj-$(CONFIG_HOSTAP_CS) += hostap_cs.o
 obj-$(CONFIG_HOSTAP_PLX) += hostap_plx.o