diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 21:14:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 21:14:22 -0400 |
| commit | b50df7d1fb37eb6aea87590b391d7111fde87121 (patch) | |
| tree | 9ec6e10ffcbb9433128d97ab1bc1a50ff8dea088 /drivers/uwb/hwa-rc.c | |
| parent | 352d4657b23fbd329efccc396000a549e0150907 (diff) | |
| parent | bcf59e2c4dea780e4abf48d5e673f5d79f9ee064 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
uwb: remove duplicate cpu_to_le16()
uwb: declare MODULE_FIRMWARE() in i1480 DFU driver
uwb: make USB device id table constant
uwb: wlp: refactor wlp_get_<attribute>() macros
Diffstat (limited to 'drivers/uwb/hwa-rc.c')
| -rw-r--r-- | drivers/uwb/hwa-rc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/hwa-rc.c b/drivers/uwb/hwa-rc.c index e7eeb63fab23..b409c228f254 100644 --- a/drivers/uwb/hwa-rc.c +++ b/drivers/uwb/hwa-rc.c | |||
| @@ -891,7 +891,7 @@ static int hwarc_post_reset(struct usb_interface *iface) | |||
| 891 | } | 891 | } |
| 892 | 892 | ||
| 893 | /** USB device ID's that we handle */ | 893 | /** USB device ID's that we handle */ |
| 894 | static struct usb_device_id hwarc_id_table[] = { | 894 | static const struct usb_device_id hwarc_id_table[] = { |
| 895 | /* D-Link DUB-1210 */ | 895 | /* D-Link DUB-1210 */ |
| 896 | { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3d02, 0xe0, 0x01, 0x02), | 896 | { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3d02, 0xe0, 0x01, 0x02), |
| 897 | .driver_info = WUSB_QUIRK_WHCI_CMD_EVT }, | 897 | .driver_info = WUSB_QUIRK_WHCI_CMD_EVT }, |