diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-08-11 13:37:26 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-08-11 13:37:26 -0400 |
| commit | a06d8aba0e3f7faa30e95b12220b0c90bca41a07 (patch) | |
| tree | 1b12ea26f20199785e955ef67a28a25c6b042508 /drivers/net/wireless/rt2x00/rt2800usb.c | |
| parent | aa02bc7084501d2edecb0e5b9de56da070db19aa (diff) | |
| parent | 059c4383550b158bc1b6d34d8ab085e81cb3d71b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800usb.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2800usb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c index 507559361d87..939563162fb3 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c | |||
| @@ -921,6 +921,8 @@ static struct usb_device_id rt2800usb_device_table[] = { | |||
| 921 | { USB_DEVICE(0x07d1, 0x3c16) }, | 921 | { USB_DEVICE(0x07d1, 0x3c16) }, |
| 922 | /* Draytek */ | 922 | /* Draytek */ |
| 923 | { USB_DEVICE(0x07fa, 0x7712) }, | 923 | { USB_DEVICE(0x07fa, 0x7712) }, |
| 924 | /* DVICO */ | ||
| 925 | { USB_DEVICE(0x0fe9, 0xb307) }, | ||
| 924 | /* Edimax */ | 926 | /* Edimax */ |
| 925 | { USB_DEVICE(0x7392, 0x7711) }, | 927 | { USB_DEVICE(0x7392, 0x7711) }, |
| 926 | { USB_DEVICE(0x7392, 0x7717) }, | 928 | { USB_DEVICE(0x7392, 0x7717) }, |