diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-26 19:09:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-26 19:09:43 -0400 |
| commit | 0e5606e4f46b7cf52dd445af01e71ed9dbb7f735 (patch) | |
| tree | b3a5e9a525de646bb353b2d9d5db305fdd3fd54e /drivers/net/wireless/rt2x00/rt73usb.c | |
| parent | 7c0ecc4c4f8fd90988aab8a95297b9c0038b6160 (diff) | |
| parent | 7a193a5df7580957c918269e4ba2fccbe4141cb4 (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 8103d41a154..3909cf42f47 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
| @@ -2095,6 +2095,8 @@ static struct usb_device_id rt73usb_device_table[] = { | |||
| 2095 | { USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) }, | 2095 | { USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2096 | /* Conceptronic */ | 2096 | /* Conceptronic */ |
| 2097 | { USB_DEVICE(0x14b2, 0x3c22), USB_DEVICE_DATA(&rt73usb_ops) }, | 2097 | { USB_DEVICE(0x14b2, 0x3c22), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2098 | /* Corega */ | ||
| 2099 | { USB_DEVICE(0x07aa, 0x002e), USB_DEVICE_DATA(&rt73usb_ops) }, | ||
| 2098 | /* D-Link */ | 2100 | /* D-Link */ |
| 2099 | { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) }, | 2101 | { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2100 | { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) }, | 2102 | { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) }, |