Merge branch 'for-2.6.26' into for-next

[pandora-kernel.git] / drivers / net / wireless / Makefile

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index c2642bc..2c343aa 100644 (file)
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -56,7 +56,7 @@ obj-$(CONFIG_RTL8187) += rtl8187.o
 
 obj-$(CONFIG_ADM8211)  += adm8211.o
 
-obj-$(CONFIG_IWLCORE)  += iwlwifi/
+obj-$(CONFIG_IWLWIFI)  += iwlwifi/
 obj-$(CONFIG_RT2X00)   += rt2x00/
 
 obj-$(CONFIG_P54_COMMON)       += p54/