diff options
author | Samuel Ortiz <samuel.ortiz@intel.com> | 2008-12-18 21:37:13 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 15:58:59 -0500 |
commit | b5b83239e7a3540ff31db24249b90f9f6d7f5be8 (patch) | |
tree | 550b717823d4836e5a312dcd6e24bc0ac73a781d /drivers/net/wireless/iwlwifi/iwl-led.h | |
parent | d9829a67f953379b5cab6b78ae8f7a879a591eb1 (diff) |
iwl3945: Getting rid of iwl-3945-led.h
The duplicated LED definitions prevent one from including iwl-dev.h from the
3945 specific C files.
Moreover, we are sharing many definitions between iwl-3945-led.h and
iwl-led.h, so let's just use the iwl one. Note that this file will get more
cleanups once we share a common iwl_priv structure.
Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com>
Acked-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-led.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-led.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.h b/drivers/net/wireless/iwlwifi/iwl-led.h index 021e00bcd1be..0b50b909939d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-led.h +++ b/drivers/net/wireless/iwlwifi/iwl-led.h | |||
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | struct iwl_priv; | 31 | struct iwl_priv; |
32 | 32 | ||
33 | #ifdef CONFIG_IWLWIFI_LEDS | 33 | #if defined(CONFIG_IWLWIFI_LEDS) || defined(CONFIG_IWL3945_LEDS) |
34 | #include <linux/leds.h> | 34 | #include <linux/leds.h> |
35 | 35 | ||
36 | #define IWL_LED_SOLID 11 | 36 | #define IWL_LED_SOLID 11 |
@@ -47,7 +47,9 @@ enum led_type { | |||
47 | IWL_LED_TRG_RADIO, | 47 | IWL_LED_TRG_RADIO, |
48 | IWL_LED_TRG_MAX, | 48 | IWL_LED_TRG_MAX, |
49 | }; | 49 | }; |
50 | #endif | ||
50 | 51 | ||
52 | #ifdef CONFIG_IWLWIFI_LEDS | ||
51 | 53 | ||
52 | struct iwl_led { | 54 | struct iwl_led { |
53 | struct iwl_priv *priv; | 55 | struct iwl_priv *priv; |