Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index bf78317a6adb..20a504072895 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -1137,6 +1137,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
 #ifdef CONFIG_RT2800USB_RT33XX
         /* Belkin */
         { USB_DEVICE(0x050d, 0x945b) },
+        /* D-Link */
+        { USB_DEVICE(0x2001, 0x3c17) },
         /* Panasonic */
         { USB_DEVICE(0x083a, 0xb511) },
         /* Philips */
@@ -1237,7 +1239,6 @@ static struct usb_device_id rt2800usb_device_table[] = {
         /* D-Link */
         { USB_DEVICE(0x07d1, 0x3c0b) },
         { USB_DEVICE(0x07d1, 0x3c17) },
-        { USB_DEVICE(0x2001, 0x3c17) },
         /* Encore */
         { USB_DEVICE(0x203d, 0x14a1) },
         /* Gemtek */