Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 2ccc114b3ff6b612e94d2ce6ac92c70126c3cdda..7bbea097cda2849108a9e5c052101226059e1802 100644 (file)
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -48,7 +48,7 @@ config MOUSE_PS2_ALPS
          If unsure, say Y.
 
 config MOUSE_PS2_LOGIPS2PP
-       bool "Logictech PS/2++ mouse protocol extension" if EMBEDDED
+       bool "Logitech PS/2++ mouse protocol extension" if EMBEDDED
        default y
        depends on MOUSE_PS2
        help
@@ -111,6 +111,7 @@ config MOUSE_SERIAL
 
 config MOUSE_APPLETOUCH
        tristate "Apple USB Touchpad support"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use an Apple USB Touchpad.
@@ -215,4 +216,20 @@ config MOUSE_HIL
        help
          Say Y here to support HIL pointers.
 
+config MOUSE_GPIO
+       tristate "GPIO mouse"
+       depends on GENERIC_GPIO
+       select INPUT_POLLDEV
+       help
+         This driver simulates a mouse on GPIO lines of various CPUs (and some
+         other chips).
+
+         Say Y here if your device has buttons or a simple joystick connected
+         directly to GPIO lines. Your board-specific setup logic must also
+         provide a platform device and platform data saying which GPIOs are
+         used.
+
+         To compile this driver as a module, choose M here: the
+         module will be called gpio_mouse.
+
 endif