diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-15 23:29:12 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-15 23:29:12 -0400 |
commit | 4c0e799a9a6dc64426ddb6c03aea1a154357658f (patch) | |
tree | 2d9aa9493d80fceb178a63bf15bb3d9edfc5fbae /drivers/input/mouse/Kconfig | |
parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
parent | b8d055a878ee0f997ded40649701089d2486f850 (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/mouse/Kconfig')
-rw-r--r-- | drivers/input/mouse/Kconfig | 10 |
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 | |||
96 | 96 | ||
97 | If unsure, say N. | 97 | If unsure, say N. |
98 | 98 | ||
99 | config MOUSE_PS2_OLPC | ||
100 | bool "OLPC PS/2 mouse protocol extension" | ||
101 | depends on MOUSE_PS2 && OLPC | ||
102 | help | ||
103 | Say Y here if you have an OLPC XO-1 laptop (with built-in | ||
104 | PS/2 touchpad/tablet device). The manufacturer calls the | ||
105 | touchpad an HGPK. | ||
106 | |||
107 | If unsure, say N. | ||
108 | |||
99 | config MOUSE_SERIAL | 109 | config MOUSE_SERIAL |
100 | tristate "Serial mouse" | 110 | tristate "Serial mouse" |
101 | select SERIO | 111 | select SERIO |