tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
usbtouchscreen: fix ITM data reading
USB: New device ID for ftdi_sio usb serial driver
USB: Support for USB20SVGA-WH & USB20SVGA-DG
USB: hid-core.c: fix duplicate USB_DEVICE_ID_GTCO_404

Linus Torvalds 5eea7ee2 e004876c

+11 -3
unified split
+2 -2
drivers/usb/input/hid-core.c
··· 1444 1444 #define USB_DEVICE_ID_GTCO_402 0x0402 1445 1445 #define USB_DEVICE_ID_GTCO_403 0x0403 1446 1446 #define USB_DEVICE_ID_GTCO_404 0x0404 1447 - #define USB_DEVICE_ID_GTCO_404 0x0405 1447 + #define USB_DEVICE_ID_GTCO_405 0x0405 1448 1448 #define USB_DEVICE_ID_GTCO_500 0x0500 1449 1449 #define USB_DEVICE_ID_GTCO_501 0x0501 1450 1450 #define USB_DEVICE_ID_GTCO_502 0x0502 ··· 1657 1657 { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_402, HID_QUIRK_IGNORE }, 1658 1658 { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_403, HID_QUIRK_IGNORE }, 1659 1659 { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404, HID_QUIRK_IGNORE }, 1660 - { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404, HID_QUIRK_IGNORE }, 1660 + { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_405, HID_QUIRK_IGNORE }, 1661 1661 { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_500, HID_QUIRK_IGNORE }, 1662 1662 { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_501, HID_QUIRK_IGNORE }, 1663 1663 { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_502, HID_QUIRK_IGNORE },
+1 -1
drivers/usb/input/usbtouchscreen.c
··· 286 286 static int itm_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press) 287 287 { 288 288 *x = ((pkt[0] & 0x1F) << 7) | (pkt[3] & 0x7F); 289 - *x = ((pkt[1] & 0x1F) << 7) | (pkt[4] & 0x7F); 289 + *y = ((pkt[1] & 0x1F) << 7) | (pkt[4] & 0x7F); 290 290 *press = ((pkt[2] & 0x1F) << 7) | (pkt[5] & 0x7F); 291 291 *touch = ~pkt[7] & 0x20; 292 292
+2
drivers/usb/misc/sisusbvga/sisusb.c
··· 3435 3435 3436 3436 static struct usb_device_id sisusb_table [] = { 3437 3437 { USB_DEVICE(0x0711, 0x0900) }, 3438 + { USB_DEVICE(0x0711, 0x0901) }, 3439 + { USB_DEVICE(0x0711, 0x0902) }, 3438 3440 { USB_DEVICE(0x182d, 0x021c) }, 3439 3441 { USB_DEVICE(0x182d, 0x0269) }, 3440 3442 { }
+1
drivers/usb/serial/ftdi_sio.c
··· 506 506 { USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) }, 507 507 { USB_DEVICE(FTDI_VID, FTDI_THORLABS_PID) }, 508 508 { USB_DEVICE(TESTO_VID, TESTO_USB_INTERFACE_PID) }, 509 + { USB_DEVICE(FTDI_VID, FTDI_GAMMA_SCOUT_PID) }, 509 510 { }, /* Optional parameter entry */ 510 511 { } /* Terminating entry */ 511 512 };
+5
drivers/usb/serial/ftdi_sio.h
··· 467 467 #define TESTO_VID 0x128D 468 468 #define TESTO_USB_INTERFACE_PID 0x0001 469 469 470 + /* 471 + * Gamma Scout (http://gamma-scout.com/). Submitted by rsc@runtux.com. 472 + */ 473 + #define FTDI_GAMMA_SCOUT_PID 0xD678 /* Gamma Scout online */ 474 + 470 475 /* Commands */ 471 476 #define FTDI_SIO_RESET 0 /* Reset the port */ 472 477 #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */