Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/wireless/iwlwifi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ config IWLWIFI_LEDS 
	bool

	default n



config IWLCORE_RFKILL

config IWLWIFI_RFKILL

	boolean "IWLWIFI RF kill support"

	depends on IWLCORE

	select RFKILL

drivers/net/wireless/iwlwifi/Makefile

+8 −21
Original line number Diff line number Diff line 
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_IWLCORE)	:= iwlcore.o

iwlcore-objs 		:= iwl-core.o iwl-eeprom.o iwl-hcmd.o

iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o

iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o

iwlcore-$(CONFIG_IWLWIFI_RFKILL) += iwl-rfkill.o



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



iwl3945-objs		:= iwl3945-base.o iwl-3945.o iwl-3945-rs.o

iwl3945-$(CONFIG_IWL3945_LEDS) += iwl-3945-led.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

drivers/net/wireless/iwlwifi/iwl-4965.h

+1 −1
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ struct iwl_priv { 
	 * 4965's initialize alive response contains some calibration data. */

	struct iwl4965_init_alive_resp card_alive_init;

	struct iwl4965_alive_resp card_alive;

#ifdef CONFIG_IWLCORE_RFKILL

#ifdef CONFIG_IWLWIFI_RFKILL

	struct iwl_rfkill_mngr rfkill_mngr;

#endif

drivers/net/wireless/iwlwifi/iwl-rfkill.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct iwl_priv; 
#include <linux/input.h>





#ifdef CONFIG_IWLCORE_RFKILL

#ifdef CONFIG_IWLWIFI_RFKILL

struct iwl_rfkill_mngr {

	struct rfkill *rfkill;

	struct input_dev *input_dev;