diff options
author | Chris Zankel | 2014-02-24 09:34:36 +0100 |
---|---|---|
committer | Chris Zankel | 2014-02-24 09:34:36 +0100 |
commit | b3fdfc1b4b641d372e35ced98814289bc60bc5d1 (patch) | |
tree | 5f11d5ba885031dde45690745646519fb887f447 /drivers/staging/rtl8712/usb_intf.c | |
parent | xtensa: fix fast_syscall_spill_registers (diff) | |
parent | xtensa: wire up sched_setattr and sched_getattr syscalls (diff) | |
download | kernel-qcow2-linux-b3fdfc1b4b641d372e35ced98814289bc60bc5d1.tar.gz kernel-qcow2-linux-b3fdfc1b4b641d372e35ced98814289bc60bc5d1.tar.xz kernel-qcow2-linux-b3fdfc1b4b641d372e35ced98814289bc60bc5d1.zip |
Merge tag 'xtensa-for-next-20140221-1' into for_next
Xtensa fixes for 3.14:
- allow booting xtfpga on boards with new uBoot and >128MBytes memory;
- drop nonexistent GPIO32 support from fsf variant;
- don't select USE_GENERIC_SMP_HELPERS;
- enable common clock framework support, set up ethoc clock on xtfpga;
- wire up sched_setattr and sched_getattr syscalls.
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'drivers/staging/rtl8712/usb_intf.c')
-rw-r--r-- | drivers/staging/rtl8712/usb_intf.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c index dbefa43e4c2c..bbd5888e316b 100644 --- a/drivers/staging/rtl8712/usb_intf.c +++ b/drivers/staging/rtl8712/usb_intf.c @@ -353,6 +353,10 @@ static void disable_ht_for_spec_devid(const struct usb_device_id *pdid, } } +static const struct device_type wlan_type = { + .name = "wlan", +}; + /* * drv_init() - a device potentially for us * @@ -388,6 +392,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf, padapter->pusb_intf = pusb_intf; usb_set_intfdata(pusb_intf, pnetdev); SET_NETDEV_DEV(pnetdev, &pusb_intf->dev); + pnetdev->dev.type = &wlan_type; /* step 2. */ padapter->dvobj_init = &r8712_usb_dvobj_init; padapter->dvobj_deinit = &r8712_usb_dvobj_deinit; |