3.2-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Xose Vazquez Perez <xose.vazq...@gmail.com>

commit 63b376411173c343bbcb450f95539da91f079e0c upstream.

They were taken from ralink drivers:
2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO
2012_03_22_RT5572_Linux_STA_v2.6.0.0_DPO

0x1eda,0x2210 RT3070 Airties

0x083a,0xb511 RT3370 Panasonic
0x0471,0x20dd RT3370 Philips

0x1690,0x0764 RT35xx Askey
0x0df6,0x0065 RT35xx Sitecom
0x0df6,0x0066 RT35xx Sitecom
0x0df6,0x0068 RT35xx Sitecom

0x2001,0x3c1c RT5370 DLink
0x2001,0x3c1d RT5370 DLink

2001 is D-Link not Alpha

Signed-off-by: Xose Vazquez Perez <xose.vazq...@gmail.com>
Acked-by: Gertjan van Wingerde <gwinge...@gmail.com>
Signed-off-by: John W. Linville <linvi...@tuxdriver.com>
[bwh: Backported to 3.2: drop the 5372 devices]
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
 drivers/net/wireless/rt2x00/rt2800usb.c |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -876,6 +876,7 @@ static struct usb_device_id rt2800usb_de
        { USB_DEVICE(0x1482, 0x3c09) },
        /* AirTies */
        { USB_DEVICE(0x1eda, 0x2012) },
+       { USB_DEVICE(0x1eda, 0x2210) },
        { USB_DEVICE(0x1eda, 0x2310) },
        /* Allwin */
        { USB_DEVICE(0x8516, 0x2070) },
@@ -1088,6 +1089,10 @@ static struct usb_device_id rt2800usb_de
 #ifdef CONFIG_RT2800USB_RT33XX
        /* Belkin */
        { USB_DEVICE(0x050d, 0x945b) },
+       /* Panasonic */
+       { USB_DEVICE(0x083a, 0xb511) },
+       /* Philips */
+       { USB_DEVICE(0x0471, 0x20dd) },
        /* Ralink */
        { USB_DEVICE(0x148f, 0x3370) },
        { USB_DEVICE(0x148f, 0x8070) },
@@ -1099,6 +1104,7 @@ static struct usb_device_id rt2800usb_de
        { USB_DEVICE(0x8516, 0x3572) },
        /* Askey */
        { USB_DEVICE(0x1690, 0x0744) },
+       { USB_DEVICE(0x1690, 0x0764) },
        /* Cisco */
        { USB_DEVICE(0x167b, 0x4001) },
        /* EnGenius */
@@ -1113,6 +1119,9 @@ static struct usb_device_id rt2800usb_de
        /* Sitecom */
        { USB_DEVICE(0x0df6, 0x0041) },
        { USB_DEVICE(0x0df6, 0x0062) },
+       { USB_DEVICE(0x0df6, 0x0065) },
+       { USB_DEVICE(0x0df6, 0x0066) },
+       { USB_DEVICE(0x0df6, 0x0068) },
        /* Toshiba */
        { USB_DEVICE(0x0930, 0x0a07) },
        /* Zinwell */
@@ -1122,6 +1131,9 @@ static struct usb_device_id rt2800usb_de
        /* Azurewave */
        { USB_DEVICE(0x13d3, 0x3329) },
        { USB_DEVICE(0x13d3, 0x3365) },
+       /* D-Link */
+       { USB_DEVICE(0x2001, 0x3c1c) },
+       { USB_DEVICE(0x2001, 0x3c1d) },
        /* Ralink */
        { USB_DEVICE(0x148f, 0x5370) },
        { USB_DEVICE(0x148f, 0x5372) },


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to