diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-09-10 14:20:57 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-07 16:39:27 -0400 |
commit | db7197184802578314d974e4b2bc961bdcec8f8c (patch) | |
tree | 80b4436d96b2a0ef46ecba806592e7f6d6c71b8b /drivers/net/wireless/ath/ath5k/base.h | |
parent | 27c51f1a349f3e4eb9c1d6d3a548eafe1828cc7a (diff) |
ath5k: move ath_common to ath5k_hw
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/base.h')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/base.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h index a28c42f32c9d..005d25f2e130 100644 --- a/drivers/net/wireless/ath/ath5k/base.h +++ b/drivers/net/wireless/ath/ath5k/base.h | |||
@@ -115,7 +115,6 @@ struct ath5k_rfkill { | |||
115 | * associated with an instance of a device */ | 115 | * associated with an instance of a device */ |
116 | struct ath5k_softc { | 116 | struct ath5k_softc { |
117 | struct pci_dev *pdev; /* for dma mapping */ | 117 | struct pci_dev *pdev; /* for dma mapping */ |
118 | struct ath_common common; | ||
119 | void __iomem *iobase; /* address of the device */ | 118 | void __iomem *iobase; /* address of the device */ |
120 | struct mutex lock; /* dev-level lock */ | 119 | struct mutex lock; /* dev-level lock */ |
121 | struct ieee80211_tx_queue_stats tx_stats[AR5K_NUM_TX_QUEUES]; | 120 | struct ieee80211_tx_queue_stats tx_stats[AR5K_NUM_TX_QUEUES]; |
@@ -204,7 +203,7 @@ struct ath5k_softc { | |||
204 | 203 | ||
205 | static inline struct ath_common *ath5k_hw_common(struct ath5k_hw *ah) | 204 | static inline struct ath_common *ath5k_hw_common(struct ath5k_hw *ah) |
206 | { | 205 | { |
207 | return &ah->ah_sc->common; | 206 | return &ah->common; |
208 | } | 207 | } |
209 | 208 | ||
210 | static inline struct ath_regulatory *ath5k_hw_regulatory(struct ath5k_hw *ah) | 209 | static inline struct ath_regulatory *ath5k_hw_regulatory(struct ath5k_hw *ah) |