diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-23 14:03:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-23 14:03:38 -0700 |
| commit | 2a88e7e559f2358f4e1422d0b0c0278a74136581 (patch) | |
| tree | b4e9e56dbde79fe7185cba511a1ffd85f5d2018e /drivers/net/wireless/ipw2x00/ipw2100.c | |
| parent | 344e0f623cec5eba273db06fe57db080988d6b26 (diff) | |
| parent | 7a17a33c0da37f8d24222c967550d19dabf13617 (diff) | |
| download | op-kernel-dev-2a88e7e559f2358f4e1422d0b0c0278a74136581.zip op-kernel-dev-2a88e7e559f2358f4e1422d0b0c0278a74136581.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-commands.h
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2100.c')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 56350d5..5bbff4c 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c @@ -174,7 +174,7 @@ that only one external action is invoked at a time. #define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2100 Network Driver" #define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation" -struct pm_qos_request_list *ipw2100_pm_qos_req; +static struct pm_qos_request_list *ipw2100_pm_qos_req; /* Debugging stuff */ #ifdef CONFIG_IPW2100_DEBUG |
