diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/staging/gdm72xx/usb_ids.h | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/staging/gdm72xx/usb_ids.h')
| -rw-r--r-- | kernel/drivers/staging/gdm72xx/usb_ids.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/drivers/staging/gdm72xx/usb_ids.h b/kernel/drivers/staging/gdm72xx/usb_ids.h index 8ce544de7..7afb9ba5f 100644 --- a/kernel/drivers/staging/gdm72xx/usb_ids.h +++ b/kernel/drivers/staging/gdm72xx/usb_ids.h @@ -32,7 +32,9 @@ #define BL_PID_MASK 0xffc0 #define USB_DEVICE_BOOTLOADER(vid, pid) \ - {USB_DEVICE((vid), ((pid)&BL_PID_MASK)|B_DOWNLOAD)}, \ + {USB_DEVICE((vid), ((pid)&BL_PID_MASK)|B_DOWNLOAD)} + +#define USB_DEVICE_BOOTLOADER_DRV(vid, pid) \ {USB_DEVICE((vid), ((pid)&BL_PID_MASK)|B_DOWNLOAD|B_DIFF_DL_DRV)} #define USB_DEVICE_CDC_DATA(vid, pid) \ @@ -40,6 +42,7 @@ static const struct usb_device_id id_table[] = { USB_DEVICE_BOOTLOADER(GCT_VID, GCT_PID1), + USB_DEVICE_BOOTLOADER_DRV(GCT_VID, GCT_PID1), USB_DEVICE_CDC_DATA(GCT_VID, GCT_PID1), USB_DEVICE_CDC_DATA(GCT_VID, GCT_PID1+0x1), USB_DEVICE_CDC_DATA(GCT_VID, GCT_PID1+0x2), @@ -58,6 +61,7 @@ static const struct usb_device_id id_table[] = { USB_DEVICE_CDC_DATA(GCT_VID, GCT_PID1+0xf), USB_DEVICE_BOOTLOADER(GCT_VID, GCT_PID2), + USB_DEVICE_BOOTLOADER_DRV(GCT_VID, GCT_PID2), USB_DEVICE_CDC_DATA(GCT_VID, GCT_PID2), USB_DEVICE_CDC_DATA(GCT_VID, GCT_PID2+0x1), USB_DEVICE_CDC_DATA(GCT_VID, GCT_PID2+0x2), |