diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-11-10 12:56:38 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-11-15 13:26:43 -0500 |
commit | ae79d23d0b2c16998e60f49a16dae53521c76a45 (patch) | |
tree | 09af0e450cb44daa707c7ba77735453a9ac96baa /drivers/net/wireless/iwlwifi/Makefile | |
parent | 2a21ff446c07b95d08cbb830bd20112f3ee1d76e (diff) |
iwlagn: fix non-5000+ build
When building 4965 without 5000+ there were a
lot of build errors due to functions being used
that weren't even compiled in. To fix this move
some code around and only compile the HCMD code
for 5000+ series as it's not used for 4965.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/Makefile')
-rw-r--r-- | drivers/net/wireless/iwlwifi/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile index ce05c260870e..b85a9c8ed01e 100644 --- a/drivers/net/wireless/iwlwifi/Makefile +++ b/drivers/net/wireless/iwlwifi/Makefile | |||
@@ -12,13 +12,13 @@ CFLAGS_iwl-devtrace.o := -I$(src) | |||
12 | # AGN | 12 | # AGN |
13 | obj-$(CONFIG_IWLAGN) += iwlagn.o | 13 | obj-$(CONFIG_IWLAGN) += iwlagn.o |
14 | iwlagn-objs := iwl-agn.o iwl-agn-rs.o iwl-agn-led.o iwl-agn-ict.o | 14 | iwlagn-objs := iwl-agn.o iwl-agn-rs.o iwl-agn-led.o iwl-agn-ict.o |
15 | iwlagn-objs += iwl-agn-ucode.o iwl-agn-hcmd.o iwl-agn-tx.o | 15 | iwlagn-objs += iwl-agn-ucode.o iwl-agn-tx.o |
16 | iwlagn-objs += iwl-agn-lib.o iwl-agn-rx.o iwl-agn-calib.o | 16 | iwlagn-objs += iwl-agn-lib.o iwl-agn-rx.o iwl-agn-calib.o |
17 | iwlagn-objs += iwl-agn-tt.o iwl-agn-sta.o iwl-agn-eeprom.o | 17 | iwlagn-objs += iwl-agn-tt.o iwl-agn-sta.o iwl-agn-eeprom.o |
18 | iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-agn-debugfs.o | 18 | iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-agn-debugfs.o |
19 | 19 | ||
20 | iwlagn-$(CONFIG_IWL4965) += iwl-4965.o | 20 | iwlagn-$(CONFIG_IWL4965) += iwl-4965.o |
21 | iwlagn-$(CONFIG_IWL5000) += iwl-agn-rxon.o | 21 | iwlagn-$(CONFIG_IWL5000) += iwl-agn-rxon.o iwl-agn-hcmd.o |
22 | iwlagn-$(CONFIG_IWL5000) += iwl-5000.o | 22 | iwlagn-$(CONFIG_IWL5000) += iwl-5000.o |
23 | iwlagn-$(CONFIG_IWL5000) += iwl-6000.o | 23 | iwlagn-$(CONFIG_IWL5000) += iwl-6000.o |
24 | iwlagn-$(CONFIG_IWL5000) += iwl-1000.o | 24 | iwlagn-$(CONFIG_IWL5000) += iwl-1000.o |