Merge branch 'master' into upstream

[powerpc.git] / drivers / net / wireless / ipw2200.h

diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
index 6044c0b..ea12ad6 100644 (file)
--- 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 */