From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Fri, 7 Jan 2011 06:34:59 +0000 (-0800)
Subject: Merge branch 'next' into for-linus
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=554738da71004d96e06fb75f4772dfc3b0f47810;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'next' into for-linus

Conflicts:
	include/linux/input.h
---

554738da71004d96e06fb75f4772dfc3b0f47810
diff --cc drivers/input/keyboard/Kconfig
index 3a87f3ba5f75,a378e959368e..e98beae23cfd
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@@ -179,24 -179,8 +179,24 @@@ config KEYBOARD_GPI
  	  To compile this driver as a module, choose M here: the
  	  module will be called gpio_keys.
  
 +config KEYBOARD_GPIO_POLLED
 +	tristate "Polled GPIO buttons"
 +	depends on GENERIC_GPIO
 +	select INPUT_POLLDEV
 +	help
 +	  This driver implements support for buttons connected
 +	  to GPIO pins that are not capable of generating interrupts.
 +
 +	  Say Y here if your device has buttons connected
 +	  directly to such GPIO pins.  Your board-specific
 +	  setup logic must also provide a platform device,
 +	  with configuration data saying which GPIOs are used.
 +
 +	  To compile this driver as a module, choose M here: the
 +	  module will be called gpio_keys_polled.
 +
  config KEYBOARD_TCA6416
- 	tristate "TCA6416 Keypad Support"
+ 	tristate "TCA6416/TCA6408A Keypad Support"
  	depends on I2C
  	help
  	  This driver implements basic keypad functionality
diff --cc drivers/input/mouse/synaptics.h
index 0aefaa885871,50e20e9da442..25e5d042a72c
--- a/drivers/input/mouse/synaptics.h
+++ b/drivers/input/mouse/synaptics.h
@@@ -51,9 -51,9 +51,10 @@@
  #define SYN_EXT_CAP_REQUESTS(c)		(((c) & 0x700000) >> 20)
  #define SYN_CAP_MULTI_BUTTON_NO(ec)	(((ec) & 0x00f000) >> 12)
  #define SYN_CAP_PRODUCT_ID(ec)		(((ec) & 0xff0000) >> 16)
 -#define SYN_CAP_CLICKPAD(ex0c)		((ex0c) & 0x100100)
 +#define SYN_CAP_CLICKPAD(ex0c)		((ex0c) & 0x100000) /* 1-button ClickPad */
 +#define SYN_CAP_CLICKPAD2BTN(ex0c)	((ex0c) & 0x000100) /* 2-button ClickPad */
  #define SYN_CAP_MAX_DIMENSIONS(ex0c)	((ex0c) & 0x020000)
+ #define SYN_CAP_ADV_GESTURE(ex0c)	((ex0c) & 0x080000)
  
  /* synaptics modes query bits */
  #define SYN_MODE_ABSOLUTE(m)		((m) & (1 << 7))
diff --cc include/linux/input.h
index 9777668883be,6c407e553a40..84d4ce0d983a
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@@ -1155,7 -1138,8 +1163,8 @@@ struct ff_effect 
   *	of tracked contacts
   * @mtsize: number of MT slots the device uses
   * @slot: MT slot currently being transmitted
+  * @trkid: stores MT tracking ID for the current contact
 - * @absinfo: array of &struct absinfo elements holding information
 + * @absinfo: array of &struct input_absinfo elements holding information
   *	about absolute axes (current value, min, max, flat, fuzz,
   *	resolution)
   * @key: reflects current state of device's keys/buttons