diff options
author | Martin Blumenstingl <martin.blumenstingl@googlemail.com> | 2016-07-01 15:41:17 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2016-07-02 19:34:50 +0200 |
commit | 3ce71eaedd3ea25be0c8723fefc68e3f3aac7610 (patch) | |
tree | 7b80308e01d21125ccb0db9f3a8e8b61dafb7307 /package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch | |
parent | cbfeb7796e71aabc08b1f9e9f8818ba6279e2e29 (diff) | |
download | upstream-3ce71eaedd3ea25be0c8723fefc68e3f3aac7610.tar.gz upstream-3ce71eaedd3ea25be0c8723fefc68e3f3aac7610.tar.bz2 upstream-3ce71eaedd3ea25be0c8723fefc68e3f3aac7610.zip |
kernel: mac80211: fold the AR9280 GPIO patch into the ath9k GPIO patch
This folds 550-ath9k_add_ar9280_gpio_chip.patch into
548-ath9k_enable_gpio_chip.patch because the former patch only extends
code which is introduced in the latter.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Diffstat (limited to 'package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch')
-rw-r--r-- | package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch index c7973bb039..41bebbb44f 100644 --- a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch +++ b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch @@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #ifdef CPTCFG_MAC80211_LEDS -@@ -132,6 +134,64 @@ static void ath9k_unregister_gpio_chip(s +@@ -134,6 +136,64 @@ static void ath9k_unregister_gpio_chip(s sc->gpiochip = NULL; } @@ -94,7 +94,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #else /* CONFIG_GPIOLIB */ static inline void ath9k_register_gpio_chip(struct ath_softc *sc) -@@ -142,6 +202,14 @@ static inline void ath9k_unregister_gpio +@@ -144,6 +204,14 @@ static inline void ath9k_unregister_gpio { } @@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #endif /* CONFIG_GPIOLIB */ /********************************/ -@@ -265,6 +333,7 @@ void ath_deinit_leds(struct ath_softc *s +@@ -267,6 +335,7 @@ void ath_deinit_leds(struct ath_softc *s { struct ath_led *led; @@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> while (!list_empty(&sc->leds)) { led = list_first_entry(&sc->leds, struct ath_led, list); #ifdef CONFIG_GPIOLIB -@@ -296,6 +365,7 @@ void ath_init_leds(struct ath_softc *sc) +@@ -298,6 +367,7 @@ void ath_init_leds(struct ath_softc *sc) ath_fill_led_pin(sc); ath9k_register_gpio_chip(sc); @@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (pdata && pdata->led_name) strncpy(led_name, pdata->led_name, sizeof(led_name)); -@@ -311,7 +381,7 @@ void ath_init_leds(struct ath_softc *sc) +@@ -313,7 +383,7 @@ void ath_init_leds(struct ath_softc *sc) ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, !sc->sc_ah->config.led_active_high); |