diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
| commit | e9563355ac1175dd3440dc2ea5c28b27ed51a283 (patch) | |
| tree | 8546d55832714b5d19ba4c7799266918ca04882e /drivers/staging/rt2860/usb_main_dev.c | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| parent | Staging: ti-st: update TODO (diff) | |
| download | linux-dev-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.xz linux-dev-e9563355ac1175dd3440dc2ea5c28b27ed51a283.zip | |
Staging: Merge staging-next into Linus's tree
Conflicts:
drivers/staging/Kconfig
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860/usb_main_dev.c')
| -rw-r--r-- | drivers/staging/rt2860/usb_main_dev.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/rt2860/usb_main_dev.c b/drivers/staging/rt2860/usb_main_dev.c index 674769d2b59b..a0fe31de0a6d 100644 --- a/drivers/staging/rt2860/usb_main_dev.c +++ b/drivers/staging/rt2860/usb_main_dev.c @@ -64,6 +64,7 @@ struct usb_device_id rtusb_usb_id[] = { {USB_DEVICE(0x14B2, 0x3C07)}, /* AL */ {USB_DEVICE(0x050D, 0x8053)}, /* Belkin */ {USB_DEVICE(0x050D, 0x825B)}, /* Belkin */ + {USB_DEVICE(0x050D, 0x935B)}, /* Belkin F6D4050 v2 */ {USB_DEVICE(0x14B2, 0x3C23)}, /* Airlink */ {USB_DEVICE(0x14B2, 0x3C27)}, /* Airlink */ {USB_DEVICE(0x07AA, 0x002F)}, /* Corega */ @@ -422,8 +423,8 @@ int MlmeThread(IN void *Context) int status; status = 0; - pTask = (struct rt_rtmp_os_task *)Context; - pAd = (struct rt_rtmp_adapter *)pTask->priv; + pTask = Context; + pAd = pTask->priv; RtmpOSTaskCustomize(pTask); @@ -491,8 +492,8 @@ int RTUSBCmdThread(IN void *Context) int status; status = 0; - pTask = (struct rt_rtmp_os_task *)Context; - pAd = (struct rt_rtmp_adapter *)pTask->priv; + pTask = Context; + pAd = pTask->priv; RtmpOSTaskCustomize(pTask); |