Input: psmouse - make MOUSE_PS2_LIFEBOOK depend on X86

[safe/jmp/linux-2.6] / drivers / input / mouse / Kconfig

diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index f996546..9705f3a 100644 (file)
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -25,8 +25,8 @@ config MOUSE_PS2
          mice with wheels and extra buttons, Microsoft, Logitech or Genius
          compatible.
 
-         Synaptics TouchPad users might be interested in a specialized
-         XFree86 driver at:
+         Synaptics, ALPS or Elantech TouchPad users might be interested
+         in a specialized Xorg/XFree86 driver at:
                <http://w1.894.telia.com/~u89404340/touchpad/index.html>
          and a new version of GPM at:
                <http://www.geocities.com/dt_or/gpm/gpm.html>
@@ -70,7 +70,7 @@ config MOUSE_PS2_SYNAPTICS
 config MOUSE_PS2_LIFEBOOK
        bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EMBEDDED
        default y
-       depends on MOUSE_PS2
+       depends on MOUSE_PS2 && X86
        help
          Say Y here if you have a Fujitsu B-series Lifebook PS/2
          TouchScreen connected to your system.
@@ -87,6 +87,27 @@ config MOUSE_PS2_TRACKPOINT
 
          If unsure, say Y.
 
+config MOUSE_PS2_ELANTECH
+       bool "Elantech PS/2 protocol extension"
+       depends on MOUSE_PS2
+       help
+         Say Y here if you have an Elantech PS/2 touchpad connected
+         to your system.
+
+         Note that if you enable this driver you will need an updated
+         X.org Synaptics driver that does not require ABS_PRESSURE
+         reports from the touchpad (i.e. post 1.5.0 version). You can
+         grab a patch for the driver here:
+
+         http://userweb.kernel.org/~dtor/synaptics-no-abspressure.patch
+
+         If unsure, say N.
+
+         This driver exposes some configuration registers via sysfs
+         entries. For further information,
+         see <file:Documentation/input/elantech.txt>.
+
+
 config MOUSE_PS2_TOUCHKIT
        bool "eGalax TouchKit PS/2 protocol extension"
        depends on MOUSE_PS2
@@ -96,6 +117,16 @@ config MOUSE_PS2_TOUCHKIT
 
          If unsure, say N.
 
+config MOUSE_PS2_OLPC
+       bool "OLPC PS/2 mouse protocol extension"
+       depends on MOUSE_PS2 && OLPC
+       help
+         Say Y here if you have an OLPC XO-1 laptop (with built-in
+         PS/2 touchpad/tablet device).  The manufacturer calls the
+         touchpad an HGPK.
+
+         If unsure, say N.
+
 config MOUSE_SERIAL
        tristate "Serial mouse"
        select SERIO
@@ -255,4 +286,10 @@ config MOUSE_GPIO
          To compile this driver as a module, choose M here: the
          module will be called gpio_mouse.
 
+config MOUSE_PXA930_TRKBALL
+       tristate "PXA930 Trackball mouse"
+       depends on CPU_PXA930 || CPU_PXA935
+       help
+         Say Y here to support PXA930 Trackball mouse.
+
 endif