From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Aug 2010 22:23:49 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: MMI-PSA29.97-13-9~23088
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5cf65713f87775c548e3eb48dbafa32e12f28000;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (30 commits)
  Revert "HID: add support for the Wacom Intuos 4 wireless"
  HID: fix up Kconfig entry for ACRUX driver
  HID: add ACRUX game controller force feedback support
  HID: Force input registration for "VEC footpedal"
  HID: add HID_QUIRK_HIDINPUT_FORCE
  HID: hid-input.c: indentation fixes
  HID: hiddev: use usb_find_interface, get rid of BKL
  HID: ignore digitizer usage Undefined (0x00)
  HID: Add support for Conceptronic CLLRCMCE
  HID: hid-ids.h: Whitespace fixup, align using TABs
  HID: picolcd: implement refcounting of framebuffer
  HID: picolcd: do not reallocate memory on depth change
  HID: picolcd: Add minimal palette required by fbcon on 8bpp
  HID: magicmouse: Correct parsing of large X and Y motions.
  HID: magicmouse: report last touch up
  HID: picolcd: fix deferred_io init/cleanup to fb ordering
  HID: hid-ids.h: keep vendor ids in alphabetical order
  HID: add proper support for Elecom BM084 bluetooth mouse
  HID: magicmouse: enable horizontal scrolling
  HID: magicmouse: add param for scroll speed
  ...
---

5cf65713f87775c548e3eb48dbafa32e12f28000
diff --cc drivers/hid/hid-ids.h
index 8aee2577c1ad,fa053ab4d570..d3fc13ae094d
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -193,14 -198,13 +198,14 @@@
  #define USB_VENDOR_ID_ESSENTIAL_REALITY	0x0d7f
  #define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100
  
- #define USB_VENDOR_ID_ETURBOTOUCH	0x22b9
- #define USB_DEVICE_ID_ETURBOTOUCH	0x0006
- 
  #define USB_VENDOR_ID_ETT		0x0664
  #define USB_DEVICE_ID_TC5UH		0x0309
 +#define USB_DEVICE_ID_TC4UM		0x0306
  
- #define USB_VENDOR_ID_EZKEY 		0x0518
+ #define USB_VENDOR_ID_ETURBOTOUCH	0x22b9
+ #define USB_DEVICE_ID_ETURBOTOUCH	0x0006
+ 
+ #define USB_VENDOR_ID_EZKEY		0x0518
  #define USB_DEVICE_ID_BTC_8193		0x0002
  
  #define USB_VENDOR_ID_GAMERON		0x0810