aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-11-27 10:56:05 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-11-27 10:56:05 +0000
commit406817c4a6807a0ab5464510e0d7def35ddf13bb (patch)
tree44e0ff981905a5d67e4b3d3d36076fb0bb84ade6 /package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
parent28c7e1b274a87bcc72444a54dfbf6c3a38ce7dd9 (diff)
downloadupstream-406817c4a6807a0ab5464510e0d7def35ddf13bb.tar.gz
upstream-406817c4a6807a0ab5464510e0d7def35ddf13bb.tar.bz2
upstream-406817c4a6807a0ab5464510e0d7def35ddf13bb.zip
ath9k: merge initval updates
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38926 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/530-ath9k_extra_leds.patch')
-rw-r--r--package/kernel/mac80211/patches/530-ath9k_extra_leds.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
index 8e64f1b1c6..81fb2ed6d9 100644
--- a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
+++ b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
@@ -10,7 +10,7 @@
#else
static inline void ath_init_leds(struct ath_softc *sc)
{
-@@ -732,6 +735,13 @@ enum spectral_mode {
+@@ -733,6 +736,13 @@ enum spectral_mode {
SPECTRAL_CHANSCAN,
};
@@ -24,7 +24,7 @@
struct ath_softc {
struct ieee80211_hw *hw;
struct device *dev;
-@@ -774,9 +784,8 @@ struct ath_softc {
+@@ -775,9 +785,8 @@ struct ath_softc {
struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
#ifdef CPTCFG_MAC80211_LEDS
@@ -162,7 +162,7 @@
void ath_fill_led_pin(struct ath_softc *sc)
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -993,7 +993,7 @@ int ath9k_init_device(u16 devid, struct
+@@ -998,7 +998,7 @@ int ath9k_init_device(u16 devid, struct
#ifdef CPTCFG_MAC80211_LEDS
/* must be initialized before ieee80211_register_hw */