diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-12 22:18:44 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-12 22:18:44 +0200 |
| commit | 252f4bf400df1712408fe83ba199a66a1b57ab1d (patch) | |
| tree | e07fa00abdd55b31e22567786c78635f32c6a66c /drivers/net/wireless/iwlwifi/Makefile | |
| parent | vxge: update driver version (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-252f4bf400df1712408fe83ba199a66a1b57ab1d.tar.xz linux-252f4bf400df1712408fe83ba199a66a1b57ab1d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/ath/ar9170/main.c
drivers/net/wireless/ath/ar9170/phy.c
drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/Makefile')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile index 9d6ee836426c..3652931753e0 100644 --- a/drivers/net/wireless/iwlwifi/Makefile +++ b/drivers/net/wireless/iwlwifi/Makefile @@ -2,7 +2,7 @@ obj-$(CONFIG_IWLAGN) += iwlagn.o iwlagn-objs := iwl-agn.o iwl-agn-rs.o iwl-agn-led.o iwlagn-objs += iwl-agn-ucode.o iwl-agn-tx.o -iwlagn-objs += iwl-agn-lib.o iwl-agn-calib.o +iwlagn-objs += iwl-agn-lib.o iwl-agn-calib.o iwl-io.o iwlagn-objs += iwl-agn-tt.o iwl-agn-sta.o iwl-agn-eeprom.o iwlagn-objs += iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o |