diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-14 17:15:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-14 17:15:39 -0700 |
| commit | 942e7b102a4827fdb69a39c7f07c544542589ef9 (patch) | |
| tree | 4c47174c91eb76aaa31abc141adbee1acc649987 /drivers/net/wireless/iwlwifi/Makefile | |
| parent | 7d06b2e053d2d536348e3a0f6bb02982a41bea37 (diff) | |
| parent | 87291c0269e77b029282676448fed3706a54211a (diff) | |
| download | blackbird-op-linux-942e7b102a4827fdb69a39c7f07c544542589ef9.tar.gz blackbird-op-linux-942e7b102a4827fdb69a39c7f07c544542589ef9.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
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 5c73eede7193..1f52b92f08b5 100644 --- a/drivers/net/wireless/iwlwifi/Makefile +++ b/drivers/net/wireless/iwlwifi/Makefile @@ -1,10 +1,10 @@ obj-$(CONFIG_IWLCORE) += iwlcore.o iwlcore-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o -iwlcore-objs += iwl-rx.o iwl-tx.o iwl-sta.o +iwlcore-objs += iwl-rx.o iwl-tx.o iwl-sta.o iwl-calib.o +iwlcore-objs += iwl-scan.o iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o iwlcore-$(CONFIG_IWLWIFI_RFKILL) += iwl-rfkill.o -iwlcore-$(CONFIG_IWLWIFI_RUN_TIME_CALIB) += iwl-calib.o obj-$(CONFIG_IWL3945) += iwl3945.o iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o |
