Merge branch 'for-linville' of git://github.com/sgruszka/iwlegacy

git-mirror · Nov 21, 2011 · 4713e96 · 4713e96
2 parents e3bea1c + 9b5e2f4
commit 4713e96
Show file tree

Hide file tree

Showing 70 changed files with 34,525 additions and 36,234 deletions.
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
@@ -42,7 +42,7 @@ obj-$(CONFIG_ADM8211)	+= adm8211.o
 obj-$(CONFIG_MWL8K)	+= mwl8k.o
 
 obj-$(CONFIG_IWLWIFI)	+= iwlwifi/
-obj-$(CONFIG_IWLWIFI_LEGACY)	+= iwlegacy/
+obj-$(CONFIG_IWLEGACY)	+= iwlegacy/
 obj-$(CONFIG_RT2X00)	+= rt2x00/
 
 obj-$(CONFIG_P54_COMMON)	+= p54/