Sync with mainline: drivers/input/touchscreen

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 340ce6ad4ace8e968987acce33135bf3d03c0e2e..055b97a7ab0812fd886393a06cdee8c288292354 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -14,13 +14,10 @@ if INPUT_TOUCHSCREEN
 config TOUCHSCREEN_ADS7846
        tristate "ADS 7846 based touchscreens"
        depends on SPI_MASTER
-       select HWMON
        help
          Say Y here if you have a touchscreen interface using the
          ADS7846 controller, and your board-specific initialization
-         code includes that in its table of SPI devices.  You will
-         also get hwmon interfaces for the temperature and voltage
-         sensors this chip provides.
+         code includes that in its table of SPI devices.
 
          If unsure, say N (but it's safe to say "Y").
 
@@ -111,6 +108,42 @@ config TOUCHSCREEN_HP600
          To compile this driver as a module, choose M here: the
          module will be called hp680_ts_input.
 
+config TOUCHSCREEN_PENMOUNT
+       tristate "Penmount serial touchscreen"
+       select SERIO
+       help
+         Say Y here if you have a Penmount serial touchscreen connected to
+         your system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called penmount.
+
+config TOUCHSCREEN_TOUCHRIGHT
+       tristate "Touchright serial touchscreen"
+       select SERIO
+       help
+         Say Y here if you have a Touchright serial touchscreen connected to
+         your system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called touchright.
+
+config TOUCHSCREEN_TOUCHWIN
+       tristate "Touchwin serial touchscreen"
+       select SERIO
+       help
+         Say Y here if you have a Touchwin serial touchscreen connected to
+         your system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called touchwin.
+
 config TOUCHSCREEN_TSC2102
        tristate "TSC 2102 based touchscreens"
        depends on SPI_MASTER
@@ -126,7 +159,6 @@ config TOUCHSCREEN_TSC2102
          To compile this driver as a module, choose M here: the
          module will be called tsc2102_ts.
 
-endif
 config TOUCHSCREEN_OMAP
        tristate "OMAP touchscreen input driver"
        depends on INPUT && INPUT_TOUCHSCREEN && (MACH_OMAP_H2 || MACH_OMAP_H3)
@@ -140,5 +172,4 @@ config TOUCHSCREEN_OMAP
          To compile this driver as a module, choose M here: the
          module will be called omap_ts.
 
-
-
+endif

diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 2cc4512d6f70354494be8c42e58d971861f1914c..b1cdcaa7360ce3befa717d91630f5e5b625198e9 100644 (file)
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -12,5 +12,7 @@ obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o
 obj-$(CONFIG_TOUCHSCREEN_MTOUCH) += mtouch.o
 obj-$(CONFIG_TOUCHSCREEN_MK712)        += mk712.o
 obj-$(CONFIG_TOUCHSCREEN_HP600)        += hp680_ts_input.o
+obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)   += touchright.o
+obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)     += touchwin.o
 obj-$(CONFIG_TOUCHSCREEN_TSC2102)      += tsc2102_ts.o
 obj-$(CONFIG_TOUCHSCREEN_OMAP) += omap/