aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/rt2x00/rt2800.h1
-rw-r--r--drivers/net/wireless/rt2x00/rt2800lib.c5
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00.h3
3 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index 2aa03751c341..35afe6376a4d 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -63,7 +63,6 @@
63 */ 63 */
64#define REV_RT2860C 0x0100 64#define REV_RT2860C 0x0100
65#define REV_RT2860D 0x0101 65#define REV_RT2860D 0x0101
66#define REV_RT2870D 0x0101
67#define REV_RT2872E 0x0200 66#define REV_RT2872E 0x0200
68#define REV_RT3070E 0x0200 67#define REV_RT3070E 0x0200
69#define REV_RT3070F 0x0201 68#define REV_RT3070F 0x0201
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 1556e324cecc..1bf973475f1d 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1766,8 +1766,7 @@ int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
1766 rt2800_bbp_write(rt2x00dev, 82, 0x62); 1766 rt2800_bbp_write(rt2x00dev, 82, 0x62);
1767 rt2800_bbp_write(rt2x00dev, 83, 0x6a); 1767 rt2800_bbp_write(rt2x00dev, 83, 0x6a);
1768 1768
1769 if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D) || 1769 if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D))
1770 rt2x00_rt_rev(rt2x00dev, RT2870, REV_RT2870D))
1771 rt2800_bbp_write(rt2x00dev, 84, 0x19); 1770 rt2800_bbp_write(rt2x00dev, 84, 0x19);
1772 else 1771 else
1773 rt2800_bbp_write(rt2x00dev, 84, 0x99); 1772 rt2800_bbp_write(rt2x00dev, 84, 0x99);
@@ -2207,7 +2206,6 @@ int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
2207 rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word); 2206 rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word);
2208 EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word); 2207 EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word);
2209 } else if (rt2x00_rt(rt2x00dev, RT2860) || 2208 } else if (rt2x00_rt(rt2x00dev, RT2860) ||
2210 rt2x00_rt(rt2x00dev, RT2870) ||
2211 rt2x00_rt(rt2x00dev, RT2872)) { 2209 rt2x00_rt(rt2x00dev, RT2872)) {
2212 /* 2210 /*
2213 * There is a max of 2 RX streams for RT28x0 series 2211 * There is a max of 2 RX streams for RT28x0 series
@@ -2311,7 +2309,6 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
2311 value, rt2x00_get_field32(reg, MAC_CSR0_REVISION)); 2309 value, rt2x00_get_field32(reg, MAC_CSR0_REVISION));
2312 2310
2313 if (!rt2x00_rt(rt2x00dev, RT2860) && 2311 if (!rt2x00_rt(rt2x00dev, RT2860) &&
2314 !rt2x00_rt(rt2x00dev, RT2870) &&
2315 !rt2x00_rt(rt2x00dev, RT2872) && 2312 !rt2x00_rt(rt2x00dev, RT2872) &&
2316 !rt2x00_rt(rt2x00dev, RT2883) && 2313 !rt2x00_rt(rt2x00dev, RT2883) &&
2317 !rt2x00_rt(rt2x00dev, RT3070) && 2314 !rt2x00_rt(rt2x00dev, RT3070) &&
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 889a372367f6..9fc3612dd182 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -176,8 +176,7 @@ struct rt2x00_chip {
176#define RT2570 0x2570 176#define RT2570 0x2570
177#define RT2661 0x2661 177#define RT2661 0x2661
178#define RT2573 0x2573 178#define RT2573 0x2573
179#define RT2860 0x2860 /* 2.4GHz PCI/CB */ 179#define RT2860 0x2860 /* 2.4GHz */
180#define RT2870 0x2870
181#define RT2872 0x2872 /* WSOC */ 180#define RT2872 0x2872 /* WSOC */
182#define RT2883 0x2883 /* WSOC */ 181#define RT2883 0x2883 /* WSOC */
183#define RT3070 0x3070 182#define RT3070 0x3070