diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-02-21 11:11:05 -0800 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-02-21 11:11:05 -0800 |
| commit | 4bc85c1324aaa4a8bb0171e332ff762b6230bdfe (patch) | |
| tree | 41345e49bdc3279325990e27b4d0d43bb97ed6cc /drivers/net/wireless/Makefile | |
| parent | aa833c4b1a928b8d3c4fcc2faaa0d6b81ea02b56 (diff) | |
| download | linux-stable-4bc85c1324aaa4a8bb0171e332ff762b6230bdfe.tar.gz linux-stable-4bc85c1324aaa4a8bb0171e332ff762b6230bdfe.tar.bz2 linux-stable-4bc85c1324aaa4a8bb0171e332ff762b6230bdfe.zip | |
Revert "iwlwifi: split the drivers for agn and legacy devices 3945/4965"
This reverts commit aa833c4b1a928b8d3c4fcc2faaa0d6b81ea02b56.
Diffstat (limited to 'drivers/net/wireless/Makefile')
| -rw-r--r-- | drivers/net/wireless/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index cd0c7e2aed43..9760561a27a5 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -41,8 +41,7 @@ obj-$(CONFIG_ADM8211) += adm8211.o obj-$(CONFIG_MWL8K) += mwl8k.o -obj-$(CONFIG_IWLAGN) += iwlwifi/ -obj-$(CONFIG_IWLWIFI_LEGACY) += iwlegacy/ +obj-$(CONFIG_IWLWIFI) += iwlwifi/ obj-$(CONFIG_RT2X00) += rt2x00/ obj-$(CONFIG_P54_COMMON) += p54/ |