Commit eadd3c4b authored by Reinette Chatre's avatar Reinette Chatre Committed by John W. Linville

iwlwifi: make Makefile more concise

Also change CONFIG_IWLCORE_RFKILL to CONFIG_IWLWIFI_RFKILL to
be more consistent with other config variables.
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Acked-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 51dbfd1d
...@@ -6,7 +6,7 @@ config IWLWIFI_LEDS ...@@ -6,7 +6,7 @@ config IWLWIFI_LEDS
bool bool
default n default n
config IWLCORE_RFKILL config IWLWIFI_RFKILL
boolean "IWLWIFI RF kill support" boolean "IWLWIFI RF kill support"
depends on IWLCORE depends on IWLCORE
select RFKILL select RFKILL
......
obj-$(CONFIG_IWLCORE) += iwlcore.o obj-$(CONFIG_IWLCORE) := iwlcore.o
iwlcore-objs = iwl-core.o iwl-eeprom.o iwl-hcmd.o iwlcore-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o
iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
ifeq ($(CONFIG_IWLWIFI_DEBUGFS),y) iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o
iwlcore-objs += iwl-debugfs.o iwlcore-$(CONFIG_IWLWIFI_RFKILL) += iwl-rfkill.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 obj-$(CONFIG_IWL3945) += iwl3945.o
iwl3945-objs = iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o
iwl3945-$(CONFIG_IWL3945_LEDS) += iwl-3945-led.o
ifeq ($(CONFIG_IWL3945_LEDS),y)
iwl3945-objs += iwl-3945-led.o
endif
obj-$(CONFIG_IWL4965) += iwl4965.o obj-$(CONFIG_IWL4965) += iwl4965.o
iwl4965-objs = iwl4965-base.o iwl-4965.o iwl-4965-rs.o iwl-sta.o iwl4965-objs := iwl4965-base.o iwl-4965.o iwl-4965-rs.o iwl-sta.o
...@@ -1034,7 +1034,7 @@ struct iwl_priv { ...@@ -1034,7 +1034,7 @@ struct iwl_priv {
* 4965's initialize alive response contains some calibration data. */ * 4965's initialize alive response contains some calibration data. */
struct iwl4965_init_alive_resp card_alive_init; struct iwl4965_init_alive_resp card_alive_init;
struct iwl4965_alive_resp card_alive; struct iwl4965_alive_resp card_alive;
#ifdef CONFIG_IWLCORE_RFKILL #ifdef CONFIG_IWLWIFI_RFKILL
struct iwl_rfkill_mngr rfkill_mngr; struct iwl_rfkill_mngr rfkill_mngr;
#endif #endif
......
...@@ -34,7 +34,7 @@ struct iwl_priv; ...@@ -34,7 +34,7 @@ struct iwl_priv;
#include <linux/input.h> #include <linux/input.h>
#ifdef CONFIG_IWLCORE_RFKILL #ifdef CONFIG_IWLWIFI_RFKILL
struct iwl_rfkill_mngr { struct iwl_rfkill_mngr {
struct rfkill *rfkill; struct rfkill *rfkill;
struct input_dev *input_dev; struct input_dev *input_dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment