summaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-09-09 17:31:53 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-09-09 17:31:53 +0000
commit247299bfa0b5b18a98a721cdcbf4f5af4ff78a51 (patch)
tree503b5bff7313f8ed3ee7665759ad587ea2eb2cfd /package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
parente6d015489bc4afc26bdc8e0bc57a54ee7b3b049a (diff)
downloadmaster-31e0f0ae-247299bfa0b5b18a98a721cdcbf4f5af4ff78a51.tar.gz
master-31e0f0ae-247299bfa0b5b18a98a721cdcbf4f5af4ff78a51.tar.bz2
master-31e0f0ae-247299bfa0b5b18a98a721cdcbf4f5af4ff78a51.zip
rt2x00: merge an rt2800 initialization order fix
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 37922
Diffstat (limited to 'package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch')
-rw-r--r--package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch b/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
index e2cd4d0198..c0829d74fb 100644
--- a/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
+++ b/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
@@ -110,7 +110,7 @@
rt2800_rfcsr_write(rt2x00dev, 59, 0x00);
rt2800_rfcsr_write(rt2x00dev, 60, 0x00);
rt2800_rfcsr_write(rt2x00dev, 61, 0x00);
-@@ -7003,6 +7029,7 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7004,6 +7030,7 @@ static int rt2800_init_eeprom(struct rt2
* RT53xx: defined in "EEPROM_CHIP_ID" field
*/
if (rt2x00_rt(rt2x00dev, RT3290) ||
@@ -118,7 +118,7 @@
rt2x00_rt(rt2x00dev, RT5390) ||
rt2x00_rt(rt2x00dev, RT5392))
rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
-@@ -7093,7 +7120,8 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7094,7 +7121,8 @@ static int rt2800_init_eeprom(struct rt2
/*
* Detect if this device has Bluetooth co-existence.
*/
@@ -128,7 +128,7 @@
__set_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags);
/*
-@@ -7122,6 +7150,22 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7123,6 +7151,22 @@ static int rt2800_init_eeprom(struct rt2
EIRP_MAX_TX_POWER_LIMIT)
__set_bit(CAPABILITY_POWER_LIMIT, &rt2x00dev->cap_flags);