diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-01-03 15:16:34 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-03 15:16:34 -0500 |
| commit | 57adc1fcbae2c13104ce291b40f23e40a414fa87 (patch) | |
| tree | a22d95cd3a96cbd515cd24fb0833739576c5e92f /drivers/net/wireless/rt2x00/rt2800usb.c | |
| parent | faa85aa24286a9e14ae7cc797352350c3ac39986 (diff) | |
| parent | dc0d633e35643662f27a0b1c531da3cd6b204b9c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/b43/dma.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
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 b1df1a774948..ee01d2e883a0 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c | |||
| @@ -1159,6 +1159,8 @@ static struct usb_device_id rt2800usb_device_table[] = { | |||
| 1159 | { USB_DEVICE(0x7392, 0x7722) }, | 1159 | { USB_DEVICE(0x7392, 0x7722) }, |
| 1160 | /* Encore */ | 1160 | /* Encore */ |
| 1161 | { USB_DEVICE(0x203d, 0x14a1) }, | 1161 | { USB_DEVICE(0x203d, 0x14a1) }, |
| 1162 | /* Fujitsu Stylistic 550 */ | ||
| 1163 | { USB_DEVICE(0x1690, 0x0761) }, | ||
| 1162 | /* Gemtek */ | 1164 | /* Gemtek */ |
| 1163 | { USB_DEVICE(0x15a9, 0x0010) }, | 1165 | { USB_DEVICE(0x15a9, 0x0010) }, |
| 1164 | /* Gigabyte */ | 1166 | /* Gigabyte */ |