diff options
| author | Greg Kroah-Hartman | 2010-12-07 19:47:56 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-12-07 19:47:56 +0100 |
| commit | ea3398a1ae54cd3403f3cc0f6aa498c7452c681a (patch) | |
| tree | 19903cfd3eb11f6cdd84f3b6923e604028178150 /drivers/staging/rt2860 | |
| parent | staging: hv: Convert camel case local variables in blkvsc.c to lowercase (diff) | |
| parent | Linux 2.6.37-rc5 (diff) | |
| download | kernel-qcow2-linux-ea3398a1ae54cd3403f3cc0f6aa498c7452c681a.tar.gz kernel-qcow2-linux-ea3398a1ae54cd3403f3cc0f6aa498c7452c681a.tar.xz kernel-qcow2-linux-ea3398a1ae54cd3403f3cc0f6aa498c7452c681a.zip | |
Staging: Merge 2.6.37-rc5 into staging-next
This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly. It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860')
| -rw-r--r-- | drivers/staging/rt2860/usb_main_dev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/rt2860/usb_main_dev.c b/drivers/staging/rt2860/usb_main_dev.c index d90c26080740..c8cdbc234eba 100644 --- a/drivers/staging/rt2860/usb_main_dev.c +++ b/drivers/staging/rt2860/usb_main_dev.c @@ -182,6 +182,7 @@ struct usb_device_id rtusb_usb_id[] = { {USB_DEVICE(0x2001, 0x3C09)}, /* D-Link */ {USB_DEVICE(0x2001, 0x3C0A)}, /* D-Link 3072 */ {USB_DEVICE(0x2019, 0xED14)}, /* Planex Communications, Inc. */ + {USB_DEVICE(0x0411, 0x015D)}, /* Buffalo Airstation WLI-UC-GN */ {} /* Terminating entry */ }; |