diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-04 16:06:40 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-04 16:06:40 +1100 |
commit | 806834f526784fbddd3795fe435b687897962be5 (patch) | |
tree | e945c9f6987684b98ee1f7acb104a603624634df /drivers/net/wireless/iwlwifi/Makefile | |
parent | 4c1b5fa0d34e0e6a6a5ba54961ea11bb726db69c (diff) | |
parent | a5b2db67139e991d9e9e19260989d0e66a03a2b2 (diff) |
Merge commit 'net/master'
Conflicts:
MAINTAINERS
Diffstat (limited to 'drivers/net/wireless/iwlwifi/Makefile')
-rw-r--r-- | drivers/net/wireless/iwlwifi/Makefile | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile index 3bbd38358d53..2751e8aa97d7 100644 --- a/drivers/net/wireless/iwlwifi/Makefile +++ b/drivers/net/wireless/iwlwifi/Makefile @@ -1,5 +1,26 @@ +obj-$(CONFIG_IWLCORE) += iwlcore.o +iwlcore-objs = iwl-core.o iwl-eeprom.o iwl-hcmd.o + +ifeq ($(CONFIG_IWLWIFI_DEBUGFS),y) + iwlcore-objs += iwl-debugfs.o +endif + +ifeq ($(CONFIG_IWLWIFI_LEDS),y) + iwlcore-objs += iwl-led.o +endif + +ifeq ($(CONFIG_IWLCORE_RFKILL),y) + iwlcore-objs += iwl-rfkill.o +endif + obj-$(CONFIG_IWL3945) += iwl3945.o iwl3945-objs = iwl3945-base.o iwl-3945.o iwl-3945-rs.o +ifeq ($(CONFIG_IWL3945_LEDS),y) + iwl3945-objs += iwl-3945-led.o +endif + + obj-$(CONFIG_IWL4965) += iwl4965.o iwl4965-objs = iwl4965-base.o iwl-4965.o iwl-4965-rs.o + |