diff options
author | David S. Miller <davem@davemloft.net> | 2008-12-12 22:20:51 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-12 22:20:51 -0800 |
commit | 56bde885903bdb9d9531fd569096ec8c7a2d60ee (patch) | |
tree | dcb9428e525b3c57aea00706fa969805251de444 /drivers/net/wireless/iwlwifi/iwl-power.c | |
parent | a7a81fc060f050ad4ba7f6ef5cdc583dad2f7b21 (diff) | |
parent | a7b75207bd37cbbfa0b4ee7dbaf0dc6bafec8fea (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-power.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index b429daa5a2b..75ca6a54217 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c @@ -22,7 +22,7 @@ * file called LICENSE. * * Contact Information: - * James P. Ketrenos <ipw2100-admin@linux.intel.com> + * Intel Linux Wireless <ilw@linux.intel.com> * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *****************************************************************************/ @@ -39,7 +39,6 @@ #include "iwl-commands.h" #include "iwl-debug.h" #include "iwl-power.h" -#include "iwl-helpers.h" /* * Setting power level allow the card to go to sleep when not busy |