diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/wireless/rtl818x/rtl8180.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/wireless/rtl818x/rtl8180.h')
| -rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8180.h b/drivers/net/wireless/rtl818x/rtl8180.h index 8721282a8185..de3844fe06d8 100644 --- a/drivers/net/wireless/rtl818x/rtl8180.h +++ b/drivers/net/wireless/rtl818x/rtl8180.h | |||
| @@ -60,7 +60,6 @@ struct rtl8180_priv { | |||
| 60 | struct rtl818x_csr __iomem *map; | 60 | struct rtl818x_csr __iomem *map; |
| 61 | const struct rtl818x_rf_ops *rf; | 61 | const struct rtl818x_rf_ops *rf; |
| 62 | struct ieee80211_vif *vif; | 62 | struct ieee80211_vif *vif; |
| 63 | int mode; | ||
| 64 | 63 | ||
| 65 | /* rtl8180 driver specific */ | 64 | /* rtl8180 driver specific */ |
| 66 | spinlock_t lock; | 65 | spinlock_t lock; |