diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-19 16:10:32 +1100 | 
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-19 16:10:32 +1100 | 
| commit | cea555d384b85271035814c5adad23e6c7fc5d2a (patch) | |
| tree | 1181b6333a69a135293ec75f8a48c849ee32c015 /drivers/net/wireless/rtl8187_dev.c | |
| parent | 78608dd32ce46789e970d6c3c423cd668c138d6c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
| download | olio-linux-3.10-cea555d384b85271035814c5adad23e6c7fc5d2a.tar.xz olio-linux-3.10-cea555d384b85271035814c5adad23e6c7fc5d2a.zip  | |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'drivers/net/wireless/rtl8187_dev.c')
| -rw-r--r-- | drivers/net/wireless/rtl8187_dev.c | 3 | 
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c index 431e3c78bf2..69eb0132593 100644 --- a/drivers/net/wireless/rtl8187_dev.c +++ b/drivers/net/wireless/rtl8187_dev.c @@ -48,6 +48,9 @@ static struct usb_device_id rtl8187_table[] __devinitdata = {  	{USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187},  	/* Sitecom */  	{USB_DEVICE(0x0df6, 0x000d), .driver_info = DEVICE_RTL8187}, +	{USB_DEVICE(0x0df6, 0x0028), .driver_info = DEVICE_RTL8187B}, +	/* Abocom */ +	{USB_DEVICE(0x13d1, 0xabe6), .driver_info = DEVICE_RTL8187},  	{}  };  |