Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6-omap-h63xx.git] / drivers / input / Kconfig

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 2d87357e2b2b5fa38217201fa5ea900f11afe6c8..63512d906f0201e085294845ae928c642dd4ff7d 100644 (file)
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -114,28 +114,6 @@ config INPUT_JOYDEV
          To compile this driver as a module, choose M here: the
          module will be called joydev.
 
-config INPUT_TSDEV
-       tristate "Touchscreen interface"
-       ---help---
-         Say Y here if you have an application that only can understand the
-         Compaq touchscreen protocol for absolute pointer data. This is
-         useful namely for embedded configurations.
-
-         If unsure, say N.
-
-         To compile this driver as a module, choose M here: the
-         module will be called tsdev.
-
-config INPUT_TSDEV_SCREEN_X
-       int "Horizontal screen resolution"
-       depends on INPUT_TSDEV
-       default "240"
-
-config INPUT_TSDEV_SCREEN_Y
-       int "Vertical screen resolution"
-       depends on INPUT_TSDEV
-       default "320"
-
 config INPUT_EVDEV
        tristate "Event interface"
        help