diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-27 20:35:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-27 20:35:07 -0400 |
| commit | 0870352bc6e0dee485c86a0c99dd60e7089c8917 (patch) | |
| tree | 0c6259b663350594bff4f128e12f8bd6d4c769c1 /drivers/net/wireless/rt2x00/rt73usb.c | |
| parent | c44a4366649aca4f5b4a51ff71d4c9cde3b7c9da (diff) | |
| parent | 8a5117d80fe93de5df5b56480054f7df1fd20755 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt73usb.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 24fdfdfee3df..420fff42c0dd 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
| @@ -2425,6 +2425,8 @@ static struct usb_device_id rt73usb_device_table[] = { | |||
| 2425 | { USB_DEVICE(0x0df6, 0x9712), USB_DEVICE_DATA(&rt73usb_ops) }, | 2425 | { USB_DEVICE(0x0df6, 0x9712), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2426 | /* Surecom */ | 2426 | /* Surecom */ |
| 2427 | { USB_DEVICE(0x0769, 0x31f3), USB_DEVICE_DATA(&rt73usb_ops) }, | 2427 | { USB_DEVICE(0x0769, 0x31f3), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2428 | /* Tilgin */ | ||
| 2429 | { USB_DEVICE(0x6933, 0x5001), USB_DEVICE_DATA(&rt73usb_ops) }, | ||
| 2428 | /* Philips */ | 2430 | /* Philips */ |
| 2429 | { USB_DEVICE(0x0471, 0x200a), USB_DEVICE_DATA(&rt73usb_ops) }, | 2431 | { USB_DEVICE(0x0471, 0x200a), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2430 | /* Planex */ | 2432 | /* Planex */ |