Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux

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

diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index f488b6852baf78840c31fccf413ca63445965ac2..4e993425977558b4a79d408f023149d6b492339c 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>
@@ -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