Merge branch 'linus' into x86/threadinfo

[cascardo/linux.git] / drivers / input / mouse / Kconfig

diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index b40784a..7bbea09 100644 (file)
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -2,7 +2,7 @@
 # Mouse driver configuration
 #
 menuconfig INPUT_MOUSE
-       bool "Mouse"
+       bool "Mice"
        default y
        help
          Say Y here, and a list of supported mice will be displayed.
@@ -19,7 +19,7 @@ config MOUSE_PS2
        select SERIO_LIBPS2
        select SERIO_I8042 if X86_PC
        select SERIO_GSCPS2 if GSC
-       ---help---
+       help
          Say Y here if you have a PS/2 mouse connected to your system. This
          includes the standard 2 or 3-button PS/2 mouse, as well as PS/2
          mice with wheels and extra buttons, Microsoft, Logitech or Genius
@@ -37,10 +37,69 @@ config MOUSE_PS2
          To compile this driver as a module, choose M here: the
          module will be called psmouse.
 
+config MOUSE_PS2_ALPS
+       bool "ALPS PS/2 mouse protocol extension" if EMBEDDED
+       default y
+       depends on MOUSE_PS2
+       help
+         Say Y here if you have an ALPS PS/2 touchpad connected to
+         your system.
+
+         If unsure, say Y.
+
+config MOUSE_PS2_LOGIPS2PP
+       bool "Logitech PS/2++ mouse protocol extension" if EMBEDDED
+       default y
+       depends on MOUSE_PS2
+       help
+         Say Y here if you have a Logictech PS/2++ mouse connected to
+         your system.
+
+         If unsure, say Y.
+
+config MOUSE_PS2_SYNAPTICS
+       bool "Synaptics PS/2 mouse protocol extension" if EMBEDDED
+       default y
+       depends on MOUSE_PS2
+       help
+         Say Y here if you have a Synaptics PS/2 TouchPad connected to
+         your system.
+
+         If unsure, say Y.
+
+config MOUSE_PS2_LIFEBOOK
+       bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EMBEDDED
+       default y
+       depends on MOUSE_PS2
+       help
+         Say Y here if you have a Fujitsu B-series Lifebook PS/2
+         TouchScreen connected to your system.
+
+         If unsure, say Y.
+
+config MOUSE_PS2_TRACKPOINT
+       bool "IBM Trackpoint PS/2 mouse protocol extension" if EMBEDDED
+       default y
+       depends on MOUSE_PS2
+       help
+         Say Y here if you have an IBM Trackpoint PS/2 mouse connected
+         to your system.
+
+         If unsure, say Y.
+
+config MOUSE_PS2_TOUCHKIT
+       bool "eGalax TouchKit PS/2 protocol extension"
+       depends on MOUSE_PS2
+       help
+         Say Y here if you have an eGalax TouchKit PS/2 touchscreen
+         connected to your system.
+
+         If unsure, say N.
+
 config MOUSE_SERIAL
        tristate "Serial mouse"
        select SERIO
-       ---help---
+       help
          Say Y here if you have a serial (RS-232, COM port) mouse connected
          to your system. This includes Sun, MouseSystems, Microsoft,
          Logitech and all other compatible serial mice.
@@ -50,6 +109,27 @@ config MOUSE_SERIAL
          To compile this driver as a module, choose M here: the
          module will be called sermouse.
 
+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.
+
+         These are the touchpads that can be found on post-February 2005
+         Apple Powerbooks (prior models have a Synaptics touchpad connected
+         to the ADB bus).
+
+         This driver provides a basic mouse driver but can be interfaced
+         with the synaptics X11 driver to provide acceleration and
+         scrolling in X11.
+
+         For further information, see
+         <file:Documentation/input/appletouch.txt>.
+
+         To compile this driver as a module, choose M here: the
+         module will be called appletouch.
+
 config MOUSE_INPORT
        tristate "InPort/MS/ATIXL busmouse"
        depends on ISA
@@ -129,11 +209,27 @@ config MOUSE_VSXXXAA
          digitizer (VSXXX-AB) DEC produced.
 
 config MOUSE_HIL
-       tristate "HIL pointers (mice etc)."     
+       tristate "HIL pointers (mice etc)."
        depends on GSC || HP300
        select HP_SDC
        select HIL_MLC
        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