diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-26 16:40:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-26 16:40:59 -0700 |
| commit | 3d6eadcb5008beca1b289983ffd7771d1e947bac (patch) | |
| tree | 2a765d732c67173d323e903da67db12282ad597a /drivers/input/mouse/Kconfig | |
| parent | a483ab1dddf86a0e8924e94cf838eed602602b39 (diff) | |
| parent | 2a0bd75e5e687a9c34921e942c18477ea7ec2d63 (diff) | |
| download | kernel-crypto-3d6eadcb5008beca1b289983ffd7771d1e947bac.tar.gz kernel-crypto-3d6eadcb5008beca1b289983ffd7771d1e947bac.tar.xz kernel-crypto-3d6eadcb5008beca1b289983ffd7771d1e947bac.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: psmouse - add support for Elantech touchpads
Input: i8042 - add Blue FB5601 to noloop exception table
Diffstat (limited to 'drivers/input/mouse/Kconfig')
| -rw-r--r-- | drivers/input/mouse/Kconfig | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index f488b6852ba..4e993425977 100644 --- 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 |