mac80211/ath9k: replace the accidentaly committed patch

SVN-Revision: 14331
This commit is contained in:
Gabor Juhos 2009-01-31 18:46:27 +00:00
parent 24b6dbf7f1
commit 4b22e7cece

View file

@ -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));
}