diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-20 04:46:02 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-20 04:46:02 -0400 |
| commit | 4b2d9cf00962d0a0e697f887f3ecaa155cbde555 (patch) | |
| tree | 3a64ad0825e82c3df0b4d84c412c647c19e34afb /drivers/net/wireless/ipw2200.h | |
| parent | 4c1234ff24dd8dc2d9020d6315d91a71339be114 (diff) | |
| parent | 89c318ed3985da1271e00ad586f2dce8a6e75656 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
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 6044c0be2c8..ea12ad66b8e 100644 --- a/drivers/net/wireless/ipw2200.h +++ b/drivers/net/wireless/ipw2200.h @@ -1173,6 +1173,7 @@ struct ipw_priv { struct ieee80211_device *ieee; spinlock_t lock; + spinlock_t irq_lock; struct mutex mutex; /* basic pci-network driver stuff */ |