diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-03 05:43:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-03 05:43:41 -0400 |
| commit | b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768 (patch) | |
| tree | 71ae1801d264bca62efa0d22376b49de7f206e9a /drivers/net/wireless/rtl818x | |
| parent | d455e5b165a367a628110ec2d18807ea10052cd1 (diff) | |
| parent | 12186be7d2e1106cede1cc728526e3d7998cbe94 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/forcedeth.c
Diffstat (limited to 'drivers/net/wireless/rtl818x')
| -rw-r--r-- | drivers/net/wireless/rtl818x/rtl8187_dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c index 3f22cc0c9679..294250e294dd 100644 --- a/drivers/net/wireless/rtl818x/rtl8187_dev.c +++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c | |||
| @@ -74,6 +74,8 @@ static struct usb_device_id rtl8187_table[] __devinitdata = { | |||
| 74 | {USB_DEVICE(0x18E8, 0x6232), .driver_info = DEVICE_RTL8187}, | 74 | {USB_DEVICE(0x18E8, 0x6232), .driver_info = DEVICE_RTL8187}, |
| 75 | /* AirLive */ | 75 | /* AirLive */ |
| 76 | {USB_DEVICE(0x1b75, 0x8187), .driver_info = DEVICE_RTL8187}, | 76 | {USB_DEVICE(0x1b75, 0x8187), .driver_info = DEVICE_RTL8187}, |
| 77 | /* Linksys */ | ||
| 78 | {USB_DEVICE(0x1737, 0x0073), .driver_info = DEVICE_RTL8187B}, | ||
| 77 | {} | 79 | {} |
| 78 | }; | 80 | }; |
| 79 | 81 | ||