aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/Kconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2008-10-15 23:29:12 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2008-10-15 23:29:12 -0400
commit4c0e799a9a6dc64426ddb6c03aea1a154357658f (patch)
tree2d9aa9493d80fceb178a63bf15bb3d9edfc5fbae /drivers/input/mouse/Kconfig
parentLinux 2.6.27 (diff)
parentInput: wm97xx - update email address for Liam Girdwood (diff)
downloadlinux-dev-4c0e799a9a6dc64426ddb6c03aea1a154357658f.tar.xz
linux-dev-4c0e799a9a6dc64426ddb6c03aea1a154357658f.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/mouse/Kconfig')
-rw-r--r--drivers/input/mouse/Kconfig10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index f996546fc443..f488b6852baf 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -96,6 +96,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