diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-27 21:48:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-27 21:48:56 -0400 |
| commit | 8e8e43843ba3ced0c657cbc0fdb10644ec60f772 (patch) | |
| tree | e64954326ced9c365c52c256f01b5f9fb1bcae66 /drivers/net/wireless/rt2x00 | |
| parent | ed85f2c3b2b72bd20f617ac749f5c22be8d0f66e (diff) | |
| parent | 50fd4407b8bfbde7c1a0bfe4f24de7df37164342 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/usb/rndis_host.c
drivers/net/wireless/b43/dma.c
net/ipv6/ndisc.c
Diffstat (limited to 'drivers/net/wireless/rt2x00')
| -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 187e832bab2e..b3c846223432 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
| @@ -2113,6 +2113,8 @@ static struct usb_device_id rt73usb_device_table[] = { | |||
| 2113 | { USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) }, | 2113 | { USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2114 | /* Conceptronic */ | 2114 | /* Conceptronic */ |
| 2115 | { USB_DEVICE(0x14b2, 0x3c22), USB_DEVICE_DATA(&rt73usb_ops) }, | 2115 | { USB_DEVICE(0x14b2, 0x3c22), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2116 | /* Corega */ | ||
| 2117 | { USB_DEVICE(0x07aa, 0x002e), USB_DEVICE_DATA(&rt73usb_ops) }, | ||
| 2116 | /* D-Link */ | 2118 | /* D-Link */ |
| 2117 | { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) }, | 2119 | { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) }, |
| 2118 | { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) }, | 2120 | { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) }, |