aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-01-31 18:46:27 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-01-31 18:46:27 +0000
commit4b22e7cecee7c12e7fdf73204dfac7e987d270e5 (patch)
treec7b3d1fb0a867894fa65cb1b405a30e5b9a0932e
parent24b6dbf7f1a750edf4ac2ec9e04e488a5d5687d3 (diff)
downloadupstream-4b22e7cecee7c12e7fdf73204dfac7e987d270e5.tar.gz
upstream-4b22e7cecee7c12e7fdf73204dfac7e987d270e5.tar.bz2
upstream-4b22e7cecee7c12e7fdf73204dfac7e987d270e5.zip
mac80211/ath9k: replace the accidentaly committed patch
SVN-Revision: 14331
-rw-r--r--package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch20
1 files changed, 2 insertions, 18 deletions
diff --git a/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch b/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
index 85518a2038..a293d96cb3 100644
--- a/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
+++ b/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
@@ -1,38 +1,22 @@
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
-@@ -989,6 +989,11 @@ static void ath_unregister_led(struct at
+@@ -989,6 +989,9 @@ static void ath_unregister_led(struct at
static void ath_deinit_leds(struct ath_softc *sc)
{
-+#if 0
+ if (AR_SREV_9100(sc->sc_ah))
+ return;
-+#endif
+
ath_unregister_led(&sc->assoc_led);
sc->sc_flags &= ~SC_OP_LED_ASSOCIATED;
ath_unregister_led(&sc->tx_led);
-@@ -1002,6 +1007,11 @@ static void ath_init_leds(struct ath_sof
+@@ -1002,6 +1005,9 @@ static void ath_init_leds(struct ath_sof
char *trigger;
int ret;
-+#if 0
+ if (AR_SREV_9100(sc->sc_ah))
+ return;
-+#endif
+
/* Configure gpio 1 for output */
ath9k_hw_cfg_output(sc->sc_ah, ATH_LED_PIN,
AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
---- a/drivers/net/wireless/ath9k/hw.c
-+++ b/drivers/net/wireless/ath9k/hw.c
-@@ -3527,6 +3527,9 @@ void ath9k_hw_cfg_output(struct ath_hal
-
- void ath9k_hw_set_gpio(struct ath_hal *ah, u32 gpio, u32 val)
- {
-+ if (AR_SREV_9100(ah))
-+ return;
-+
- REG_RMW(ah, AR_GPIO_IN_OUT, ((val & 1) << gpio),
- AR_GPIO_BIT(gpio));
- }