diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-09-08 09:38:32 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-09-08 09:38:32 +0000 |
commit | da032a4fe0515a97dbad6a0f18e20c058062d38c (patch) | |
tree | 8d99340add217d9831810232b418635ccfaf8287 /package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch | |
parent | 7467c1380b0aa1d287b9cecacab7351a65696da8 (diff) | |
download | upstream-da032a4fe0515a97dbad6a0f18e20c058062d38c.tar.gz upstream-da032a4fe0515a97dbad6a0f18e20c058062d38c.tar.bz2 upstream-da032a4fe0515a97dbad6a0f18e20c058062d38c.zip |
mac80211: merge a big batch of upstream changes/improvements
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37918 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.patch | 4 |
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 f3a76ecea4..e50429f733 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 -@@ -1746,6 +1746,53 @@ void ath9k_deinit_debug(struct ath_softc +@@ -1871,6 +1871,53 @@ void ath9k_deinit_debug(struct ath_softc } } @@ -54,7 +54,7 @@ int ath9k_init_debug(struct ath_hw *ah) { struct ath_common *common = ath9k_hw_common(ah); -@@ -1763,6 +1810,8 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1888,6 +1935,8 @@ int ath9k_init_debug(struct ath_hw *ah) ath9k_dfs_init_debug(sc); |