Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 574b18a..81dd8c7 100644 (file)
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -37,6 +37,65 @@ 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 "Logictech 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
@@ -86,16 +145,6 @@ config MOUSE_PC110PAD
          To compile this driver as a module, choose M here: the
          module will be called pc110pad.
 
-config MOUSE_MAPLE
-       tristate "Maple bus mouse"
-       depends on SH_DREAMCAST && MAPLE
-       help
-         Say Y if you have a DreamCast console and a mouse attached to
-         its Maple bus.
-
-         To compile this driver as a module, choose M here: the
-         module will be called maplemouse.
-
 config MOUSE_AMIGA
        tristate "Amiga mouse"
        depends on AMIGA
@@ -106,6 +155,17 @@ config MOUSE_AMIGA
          To compile this driver as a module, choose M here: the
          module will be called amimouse.
 
+config MOUSE_ATARI
+       tristate "Atari mouse"
+       depends on ATARI
+       select ATARI_KBD_CORE
+       help
+         Say Y here if you have an Atari and want its native mouse
+         supported by the kernel.
+
+         To compile this driver as a module, choose M here: the
+         module will be called atarimouse.
+
 config MOUSE_RISCPC
        tristate "Acorn RiscPC mouse"
        depends on ARCH_ACORN
@@ -128,8 +188,8 @@ config MOUSE_VSXXXAA
          digitizer (VSXXX-AB) DEC produced.
 
 config MOUSE_HIL
-       tristate "HIL pointers (mice etc)."     
-       depends on GSC
+       tristate "HIL pointers (mice etc)."
+       depends on GSC || HP300
        select HP_SDC
        select HIL_MLC
        help