aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hid/hid-multitouch.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 65ea23be9677..9ef24b518f12 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1649,14 +1649,6 @@ static const struct hid_device_id mt_devices[] = {
1649 MT_USB_DEVICE(USB_VENDOR_ID_TURBOX, 1649 MT_USB_DEVICE(USB_VENDOR_ID_TURBOX,
1650 USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART) }, 1650 USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART) },
1651 1651
1652 /* Panasonic panels */
1653 { .driver_data = MT_CLS_PANASONIC,
1654 MT_USB_DEVICE(USB_VENDOR_ID_PANASONIC,
1655 USB_DEVICE_ID_PANABOARD_UBT780) },
1656 { .driver_data = MT_CLS_PANASONIC,
1657 MT_USB_DEVICE(USB_VENDOR_ID_PANASONIC,
1658 USB_DEVICE_ID_PANABOARD_UBT880) },
1659
1660 /* Novatek Panel */ 1652 /* Novatek Panel */
1661 { .driver_data = MT_CLS_NSMU, 1653 { .driver_data = MT_CLS_NSMU,
1662 MT_USB_DEVICE(USB_VENDOR_ID_NOVATEK, 1654 MT_USB_DEVICE(USB_VENDOR_ID_NOVATEK,
@@ -1667,6 +1659,14 @@ static const struct hid_device_id mt_devices[] = {
1667 HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, 1659 HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
1668 USB_VENDOR_ID_NTRIG, 0x1b05) }, 1660 USB_VENDOR_ID_NTRIG, 0x1b05) },
1669 1661
1662 /* Panasonic panels */
1663 { .driver_data = MT_CLS_PANASONIC,
1664 MT_USB_DEVICE(USB_VENDOR_ID_PANASONIC,
1665 USB_DEVICE_ID_PANABOARD_UBT780) },
1666 { .driver_data = MT_CLS_PANASONIC,
1667 MT_USB_DEVICE(USB_VENDOR_ID_PANASONIC,
1668 USB_DEVICE_ID_PANABOARD_UBT880) },
1669
1670 /* PixArt optical touch screen */ 1670 /* PixArt optical touch screen */
1671 { .driver_data = MT_CLS_INRANGE_CONTACTNUMBER, 1671 { .driver_data = MT_CLS_INRANGE_CONTACTNUMBER,
1672 MT_USB_DEVICE(USB_VENDOR_ID_PIXART, 1672 MT_USB_DEVICE(USB_VENDOR_ID_PIXART,