diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-06-26 19:35:44 +0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-06-26 19:35:44 +0400 |
| commit | 62ed948cb1405fe95d61d8c6445c102e0c9da0a6 (patch) | |
| tree | f139adcc861a05e7cc09cdb387a271a652fc2d07 /drivers/net/wireless/ipw2200.h | |
| parent | 17ffc7ba6d7ea68b8d5f55a5ca1b87163e69720d (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
| download | linux-62ed948cb1405fe95d61d8c6445c102e0c9da0a6.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-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 { struct ieee80211_device *ieee; spinlock_t lock; + spinlock_t irq_lock; struct mutex mutex; /* basic pci-network driver stuff */ |