diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-09-09 17:31:53 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-09-09 17:31:53 +0000 |
commit | 844c80f3bbf7cece4d5065efc81556379ffb2849 (patch) | |
tree | a43e203fb0c5e62e1b7979e45a5659dd68209b62 /package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch | |
parent | 6ad5bd6778f050883d73e7070b134d1e6d6ab3a0 (diff) | |
download | upstream-844c80f3bbf7cece4d5065efc81556379ffb2849.tar.gz upstream-844c80f3bbf7cece4d5065efc81556379ffb2849.tar.bz2 upstream-844c80f3bbf7cece4d5065efc81556379ffb2849.zip |
rt2x00: merge an rt2800 initialization order fix
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37922 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 6 |
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); |