From: Colin Cross <ccross@android.com>
Date: Wed, 6 Oct 2010 23:31:32 +0000 (-0700)
Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~172
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=98959c85632cde43fc83ba1b709f767fc3b8a4ee;p=firefly-linux-kernel-4.4.55.git

Merge branch 'android-2.6.36' into android-tegra-2.6.36

Conflicts:
	drivers/input/touchscreen/Kconfig

Change-Id: Ifc75266e258f9513d78c47c12e2f1de1d2344f02
---

98959c85632cde43fc83ba1b709f767fc3b8a4ee
diff --cc drivers/input/touchscreen/Kconfig
index cab10a00e414,4098eb8f7de6..d50fd5603604
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@@ -328,19 -328,12 +328,25 @@@ config TOUCHSCREEN_MIGO
  	  To compile this driver as a module, choose M here: the
  	  module will be called migor_ts.
  
 +config TOUCHSCREEN_PANJIT_I2C
 +	tristate "PANJIT I2C touchscreen driver"
 +	depends on I2C
 +	default n
 +	help
 +	  Say Y here to enable PANJIT I2C capacitive touchscreen support,
 +	  covering devices such as the MGG1010AI06 and EGG1010AI06
 +
 +	  If unsure, say N
 +
 +	  To compile this driver as a module, choose M here: the module will
 +	  be called panjit_i2c.
 +
+ config TOUCHSCREEN_SYNAPTICS_I2C_RMI
+ 	tristate "Synaptics i2c touchscreen"
+ 	depends on I2C
+ 	help
+ 	  This enables support for Synaptics RMI over I2C based touchscreens.
+ 
  config TOUCHSCREEN_TOUCHRIGHT
  	tristate "Touchright serial touchscreen"
  	select SERIO