diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-03 16:36:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-03 16:36:41 -0700 |
| commit | 5be1334062a2f358dc65016b5181e6edbfe3bd1e (patch) | |
| tree | 02ec7afd0cacda2f364e49f0c8391690f6b41a24 /drivers/net/wireless/ath/ath9k/hw.h | |
| parent | f2c31e32b378a6653f8de606149d963baf11d7d3 (diff) | |
| parent | a5d5a914770a81a1f775be2ee35b9fa8fd19d381 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 6acd0f975ae..c79889036ec 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h @@ -219,7 +219,6 @@ struct ath9k_ops_config { int additional_swba_backoff; int ack_6mb; u32 cwm_ignore_extcca; - u8 pcie_powersave_enable; bool pcieSerDesWrite; u8 pcie_clock_req; u32 pcie_waen; @@ -673,6 +672,7 @@ struct ath_hw { bool sw_mgmt_crypto; bool is_pciexpress; + bool aspm_enabled; bool is_monitoring; bool need_an_top2_fixup; u16 tx_trig_level; @@ -874,6 +874,7 @@ struct ath_bus_ops { bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data); void (*bt_coex_prep)(struct ath_common *common); void (*extn_synch_en)(struct ath_common *common); + void (*aspm_init)(struct ath_common *common); }; static inline struct ath_common *ath9k_hw_common(struct ath_hw *ah) |