diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-16 05:27:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-16 05:27:12 -0400 |
| commit | a1870b9cc280fe16fed13994810f8a1687be3bcf (patch) | |
| tree | d482018f5cc8ff0412c0c4d02f984960a5ec2385 /drivers/net/wireless/ath/ath9k/hw.h | |
| parent | 6cc90a5a6061428358d0f726a53fb44af5254111 (diff) | |
| parent | 1fa6f4af9f55bc1b753af04276984429d6b5a613 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index dd8508ef6e05..9d0b31ad4603 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
| @@ -565,9 +565,6 @@ u32 ath9k_hw_gpio_get(struct ath_hw *ah, u32 gpio); | |||
| 565 | void ath9k_hw_cfg_output(struct ath_hw *ah, u32 gpio, | 565 | void ath9k_hw_cfg_output(struct ath_hw *ah, u32 gpio, |
| 566 | u32 ah_signal_type); | 566 | u32 ah_signal_type); |
| 567 | void ath9k_hw_set_gpio(struct ath_hw *ah, u32 gpio, u32 val); | 567 | void ath9k_hw_set_gpio(struct ath_hw *ah, u32 gpio, u32 val); |
| 568 | #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE) | ||
| 569 | void ath9k_enable_rfkill(struct ath_hw *ah); | ||
| 570 | #endif | ||
| 571 | u32 ath9k_hw_getdefantenna(struct ath_hw *ah); | 568 | u32 ath9k_hw_getdefantenna(struct ath_hw *ah); |
| 572 | void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna); | 569 | void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna); |
| 573 | bool ath9k_hw_setantennaswitch(struct ath_hw *ah, | 570 | bool ath9k_hw_setantennaswitch(struct ath_hw *ah, |