From 370c5be74316f3da626f2d9df3d2dfeb6e6f163b Mon Sep 17 00:00:00 2001 From: Rami Rosen Date: Fri, 5 Dec 2008 18:16:21 +0200 Subject: [PATCH] --- yaml --- r: 122641 b: refs/heads/master c: 61ff84a4ce6451c9a0b675d355e0580e53628801 h: refs/heads/master i: 122639: 73e6f894a3cc32f4ef73cfcff59be970d95c66f8 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-3945.h | 3 --- trunk/drivers/net/wireless/iwlwifi/iwl-dev.h | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 48f6be25a8b7..d9043028823f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8ec42c1431e8a43f910fb27af4882416cf5d6b1 +refs/heads/master: 61ff84a4ce6451c9a0b675d355e0580e53628801 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-3945.h b/trunk/drivers/net/wireless/iwlwifi/iwl-3945.h index d7d13a9e22bd..05640a85d115 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-3945.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-3945.h @@ -908,9 +908,6 @@ struct iwl3945_priv { s8 user_txpower_limit; s8 max_channel_txpower_limit; -#ifdef CONFIG_PM - u32 pm_state[16]; -#endif #ifdef CONFIG_IWL3945_DEBUG /* debugging info */ diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h b/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h index 9d678d1d19df..25e87145c97c 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -994,9 +994,6 @@ struct iwl_priv { s8 tx_power_user_lmt; s8 tx_power_channel_lmt; -#ifdef CONFIG_PM - u32 pm_state[16]; -#endif #ifdef CONFIG_IWLWIFI_DEBUG /* debugging info */