diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2009-03-06 05:17:55 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-03-16 18:09:33 -0400 |
commit | 5077fd358b652b8ec33ae7158f99e08d29ad65c0 (patch) | |
tree | 2c857970bf39301d2b5743198508e79e7b862f23 | |
parent | 521031154365062ce334e05384139777db23d526 (diff) |
ath9k: always compile ath_radio_{en,dis}able
ath_radio_{en,dis}able is only compiled if RFKILL is enabled, but it is
required by the 'ath9k_wiphy_select' function.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath9k/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index 7d9c060704b6..5268697be79d 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c | |||
@@ -1084,12 +1084,6 @@ fail: | |||
1084 | ath_deinit_leds(sc); | 1084 | ath_deinit_leds(sc); |
1085 | } | 1085 | } |
1086 | 1086 | ||
1087 | #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE) | ||
1088 | |||
1089 | /*******************/ | ||
1090 | /* Rfkill */ | ||
1091 | /*******************/ | ||
1092 | |||
1093 | void ath_radio_enable(struct ath_softc *sc) | 1087 | void ath_radio_enable(struct ath_softc *sc) |
1094 | { | 1088 | { |
1095 | struct ath_hw *ah = sc->sc_ah; | 1089 | struct ath_hw *ah = sc->sc_ah; |
@@ -1166,6 +1160,12 @@ void ath_radio_disable(struct ath_softc *sc) | |||
1166 | ath9k_ps_restore(sc); | 1160 | ath9k_ps_restore(sc); |
1167 | } | 1161 | } |
1168 | 1162 | ||
1163 | #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE) | ||
1164 | |||
1165 | /*******************/ | ||
1166 | /* Rfkill */ | ||
1167 | /*******************/ | ||
1168 | |||
1169 | static bool ath_is_rfkill_set(struct ath_softc *sc) | 1169 | static bool ath_is_rfkill_set(struct ath_softc *sc) |
1170 | { | 1170 | { |
1171 | struct ath_hw *ah = sc->sc_ah; | 1171 | struct ath_hw *ah = sc->sc_ah; |