6 files changed, 66 insertions, 67 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 971618059a6f..5e640aeb03cd 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -1,5 +1,5 @@
 #
-# Mouse driver configuration
+# Touchscreen driver configuration
 #
 menuconfig INPUT_TOUCHSCREEN
         bool "Touchscreens"
@@ -44,9 +44,9 @@ config TOUCHSCREEN_BITSY
 config TOUCHSCREEN_CORGI
         tristate "SharpSL (Corgi and Spitz series) touchscreen driver"
         depends on PXA_SHARPSL
-        default y       
+        default y
         help
-          Say Y here to enable the driver for the touchscreen on the 
+          Say Y here to enable the driver for the touchscreen on the
           Sharp SL-C7xx and SL-Cxx00 series of PDAs.
 
           If unsure, say N.
@@ -164,4 +164,58 @@ config TOUCHSCREEN_UCB1400
           To compile this driver as a module, choose M here: the
           module will be called ucb1400_ts.
 
+config TOUCHSCREEN_USB_COMPOSITE
+        tristate "USB Touchscreen Driver"
+        select USB
+        help
+          USB Touchscreen driver for:
+          - eGalax Touchkit USB (also includes eTurboTouch CT-410/510/700)
+          - PanJit TouchSet USB
+          - 3M MicroTouch USB (EX II series)
+          - ITM
+          - some other eTurboTouch
+          - Gunze AHL61
+          - DMC TSC-10/25
+
+          Have a look at <http://linux.chapter7.ch/touchkit/> for
+          a usage description and the required user-space stuff.
+
+          To compile this driver as a module, choose M here: the
+          module will be called usbtouchscreen.
+
+config TOUCHSCREEN_USB_EGALAX
+        default y
+        bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED
+        depends on TOUCHSCREEN_USB_COMPOSITE
+
+config TOUCHSCREEN_USB_PANJIT
+        default y
+        bool "PanJit device support" if EMBEDDED
+        depends on TOUCHSCREEN_USB_COMPOSITE
+
+config TOUCHSCREEN_USB_3M
+        default y
+        bool "3M/Microtouch EX II series device support" if EMBEDDED
+        depends on TOUCHSCREEN_USB_COMPOSITE
+
+config TOUCHSCREEN_USB_ITM
+        default y
+        bool "ITM device support" if EMBEDDED
+        depends on TOUCHSCREEN_USB_COMPOSITE
+
+config TOUCHSCREEN_USB_ETURBO
+        default y
+        bool "eTurboTouch (non-eGalax compatible) device support" if EMBEDDED
+        depends on TOUCHSCREEN_USB_COMPOSITE
+
+config TOUCHSCREEN_USB_GUNZE
+        default y
+        bool "Gunze AHL61 device support" if EMBEDDED
+        depends on TOUCHSCREEN_USB_COMPOSITE
+
+config TOUCHSCREEN_USB_DMC_TSC10
+        default y
+        bool "DMC TSC-10/25 device support" if EMBEDDED
+        depends on TOUCHSCREEN_USB_COMPOSITE
+
 endif
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 30e6e2217a15..2f86d6ad06d3 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -1,17 +1,18 @@
 #
-# Makefile for the mouse drivers.
+# Makefile for the touchscreen drivers.
 #
 
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_TOUCHSCREEN_ADS7846)       += ads7846.o
-obj-$(CONFIG_TOUCHSCREEN_BITSY) += h3600_ts_input.o
-obj-$(CONFIG_TOUCHSCREEN_CORGI) += corgi_ts.o
-obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunze.o
-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_BITSY)         += h3600_ts_input.o
+obj-$(CONFIG_TOUCHSCREEN_CORGI)         += corgi_ts.o
+obj-$(CONFIG_TOUCHSCREEN_GUNZE)         += gunze.o
+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_USB_COMPOSITE) += usbtouchscreen.o
 obj-$(CONFIG_TOUCHSCREEN_PENMOUNT)      += penmount.o
 obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)    += touchright.o
 obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)      += touchwin.o
diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 8e18e6c64777..8e18e6c64777 100644
--- a/drivers/usb/input/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index f7865669de35..2b6caf674e4a 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -24,7 +24,6 @@ obj-$(CONFIG_USB_STORAGE)	+= storage/
 obj-$(CONFIG_USB)               += storage/
 
 obj-$(CONFIG_USB_ATI_REMOTE)    += input/
-obj-$(CONFIG_USB_MTOUCH)        += input/
 obj-$(CONFIG_USB_POWERMATE)     += input/
 obj-$(CONFIG_USB_XPAD)          += input/
 
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 86cad900c659..68109a02b6cd 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -19,60 +19,6 @@ config USB_POWERMATE
           To compile this driver as a module, choose M here: the
           module will be called powermate.
 
-config USB_TOUCHSCREEN
-        tristate "USB Touchscreen Driver"
-        depends on USB && INPUT
-        ---help---
-          USB Touchscreen driver for:
-          - eGalax Touchkit USB (also includes eTurboTouch CT-410/510/700)
-          - PanJit TouchSet USB
-          - 3M MicroTouch USB (EX II series)
-          - ITM
-          - some other eTurboTouch
-          - Gunze AHL61
-          - DMC TSC-10/25
-
-          Have a look at <http://linux.chapter7.ch/touchkit/> for
-          a usage description and the required user-space stuff.
-
-          To compile this driver as a module, choose M here: the
-          module will be called usbtouchscreen.
-
-config USB_TOUCHSCREEN_EGALAX
-        default y
-        bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED
-        depends on USB_TOUCHSCREEN
-
-config USB_TOUCHSCREEN_PANJIT
-        default y
-        bool "PanJit device support" if EMBEDDED
-        depends on USB_TOUCHSCREEN
-
-config USB_TOUCHSCREEN_3M
-        default y
-        bool "3M/Microtouch EX II series device support" if EMBEDDED
-        depends on USB_TOUCHSCREEN
-
-config USB_TOUCHSCREEN_ITM
-        default y
-        bool "ITM device support" if EMBEDDED
-        depends on USB_TOUCHSCREEN
-
-config USB_TOUCHSCREEN_ETURBO
-        default y
-        bool "eTurboTouch (non-eGalax compatible) device support" if EMBEDDED
-        depends on USB_TOUCHSCREEN
-
-config USB_TOUCHSCREEN_GUNZE
-        default y
-        bool "Gunze AHL61 device support" if EMBEDDED
-        depends on USB_TOUCHSCREEN
-
-config USB_TOUCHSCREEN_DMC_TSC10
-        default y
-        bool "DMC TSC-10/25 device support" if EMBEDDED
-        depends on USB_TOUCHSCREEN
-
 config USB_YEALINK
         tristate "Yealink usb-p1k voip phone"
         depends on USB && INPUT && EXPERIMENTAL
diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile
index a9e9b2fc5e72..c8b843ce167c 100644
--- a/drivers/usb/input/Makefile
+++ b/drivers/usb/input/Makefile
@@ -5,7 +5,6 @@
 obj-$(CONFIG_USB_ATI_REMOTE)    += ati_remote.o
 obj-$(CONFIG_USB_ATI_REMOTE2)   += ati_remote2.o
 obj-$(CONFIG_USB_KEYSPAN_REMOTE)        += keyspan_remote.o
-obj-$(CONFIG_USB_TOUCHSCREEN)   += usbtouchscreen.o
 obj-$(CONFIG_USB_POWERMATE)     += powermate.o
 obj-$(CONFIG_USB_YEALINK)       += yealink.o
 obj-$(CONFIG_USB_XPAD)          += xpad.o