diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-01-03 21:16:34 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-03 21:16:34 +0100 |
| commit | 57adc1fcbae2c13104ce291b40f23e40a414fa87 (patch) | |
| tree | a22d95cd3a96cbd515cd24fb0833739576c5e92f /drivers/net/wireless/rtlwifi/wifi.h | |
| parent | skge: fix warning when CONFIG_PM is defined but not CONFIG_PM_SLEEP (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padova... (diff) | |
| download | linux-57adc1fcbae2c13104ce291b40f23e40a414fa87.tar.xz linux-57adc1fcbae2c13104ce291b40f23e40a414fa87.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/b43/dma.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
Diffstat (limited to 'drivers/net/wireless/rtlwifi/wifi.h')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/wifi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h index 9b7d60c0bf80..cdaf1429fa0b 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h @@ -1547,6 +1547,7 @@ struct rtl_locks { struct mutex ps_mutex; /*spin lock */ + spinlock_t ips_lock; spinlock_t irq_th_lock; spinlock_t h2c_lock; spinlock_t rf_ps_lock; |