Input: omap-keypad - fix build warning

[sfrench/cifs-2.6.git] / drivers / input / Kconfig

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 2d87357e2b2b5fa38217201fa5ea900f11afe6c8..9dea14db724ca1a186f8d7f765b94c28ed0db3a3 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
@@ -159,6 +137,18 @@ config INPUT_EVBUG
          To compile this driver as a module, choose M here: the
          module will be called evbug.
 
+config INPUT_APMPOWER
+       tristate "Input Power Event -> APM Bridge" if EMBEDDED
+       depends on INPUT && APM_EMULATION
+       ---help---
+         Say Y here if you want suspend key events to trigger a user
+         requested suspend through APM. This is useful on embedded
+         systems where such behviour is desired without userspace
+         interaction. If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called apm-power.
+
 comment "Input Device Drivers"
 
 source "drivers/input/keyboard/Kconfig"