diff options
| author | Auke Kok <auke-jan.h.kok@intel.com> | 2006-06-21 16:43:50 -0400 |
|---|---|---|
| committer | Auke-jan Kok <ahkok@gitlost.site> | 2006-06-21 16:43:50 -0400 |
| commit | 0d204094d15dac2e8a439b993f71eda385b4dccd (patch) | |
| tree | 647f0ddec94d0fb4aaf74fa55bcad75946030f8a /drivers/net/wireless/ipw2200.h | |
| parent | a487a8f7b6947f6445e5a1aa876522916785d5ec (diff) | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wireless/ipw2200.h')
| -rw-r--r-- | drivers/net/wireless/ipw2200.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h index 6044c0be2c80..ea12ad66b8e8 100644 --- a/drivers/net/wireless/ipw2200.h +++ b/drivers/net/wireless/ipw2200.h | |||
| @@ -1173,6 +1173,7 @@ struct ipw_priv { | |||
| 1173 | struct ieee80211_device *ieee; | 1173 | struct ieee80211_device *ieee; |
| 1174 | 1174 | ||
| 1175 | spinlock_t lock; | 1175 | spinlock_t lock; |
| 1176 | spinlock_t irq_lock; | ||
| 1176 | struct mutex mutex; | 1177 | struct mutex mutex; |
| 1177 | 1178 | ||
| 1178 | /* basic pci-network driver stuff */ | 1179 | /* basic pci-network driver stuff */ |