aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-11-07 11:12:51 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-11-07 11:12:51 +0000
commitb798df3e960f6bcb4910a4bee447ccadc0bb7d97 (patch)
treea256166036fffae990f5120e9956e16f615f1920 /package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
parentfe2deddd963b480b2a957698bc9e193aef66a4ec (diff)
downloadmaster-187ad058-b798df3e960f6bcb4910a4bee447ccadc0bb7d97.tar.gz
master-187ad058-b798df3e960f6bcb4910a4bee447ccadc0bb7d97.tar.bz2
master-187ad058-b798df3e960f6bcb4910a4bee447ccadc0bb7d97.zip
mac80211: merge a few pending upstream fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43208 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch')
-rw-r--r--package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch b/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
index 63e1b4523b..dfcbe5693f 100644
--- a/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
+++ b/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1313,6 +1313,53 @@ void ath9k_deinit_debug(struct ath_softc
+@@ -1314,6 +1314,53 @@ void ath9k_deinit_debug(struct ath_softc
ath9k_spectral_deinit_debug(sc);
}
@@ -54,7 +54,7 @@
int ath9k_init_debug(struct ath_hw *ah)
{
struct ath_common *common = ath9k_hw_common(ah);
-@@ -1332,6 +1379,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1333,6 +1380,8 @@ int ath9k_init_debug(struct ath_hw *ah)
ath9k_tx99_init_debug(sc);
ath9k_spectral_init_debug(sc);