diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-05-24 16:47:54 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-24 16:47:54 -0400 |
| commit | 31ec97d9cebac804814de298592648f7c18d8281 (patch) | |
| tree | f725fcce0d5a9d6d7bd64b777de0a44e71773d0e /drivers/net/wireless/p54 | |
| parent | 557eed603159b4e007c57d97fad1333ecebd3c2e (diff) | |
| parent | daf8cf608d57a0b9f22276036e420cc82cf6ab4f (diff) | |
| download | blackbird-op-linux-31ec97d9cebac804814de298592648f7c18d8281.tar.gz blackbird-op-linux-31ec97d9cebac804814de298592648f7c18d8281.zip | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/p54')
| -rw-r--r-- | drivers/net/wireless/p54/p54usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index e18358725b69..a8f3bc740dfa 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c @@ -82,6 +82,7 @@ static struct usb_device_id p54u_table[] __devinitdata = { {USB_DEVICE(0x06b9, 0x0121)}, /* Thomson SpeedTouch 121g */ {USB_DEVICE(0x0707, 0xee13)}, /* SMC 2862W-G version 2 */ {USB_DEVICE(0x083a, 0x4521)}, /* Siemens Gigaset USB Adapter 54 version 2 */ + {USB_DEVICE(0x083a, 0xc501)}, /* Zoom Wireless-G 4410 */ {USB_DEVICE(0x083a, 0xf503)}, /* Accton FD7050E ver 1010ec */ {USB_DEVICE(0x0846, 0x4240)}, /* Netgear WG111 (v2) */ {USB_DEVICE(0x0915, 0x2000)}, /* Cohiba Proto board */ |
