Merge branch 'next' into for-linus

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

diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index f996546fc443757151f4f7f09f95c996f4c576d9..f488b6852baf78840c31fccf413ca63445965ac2 100644 (file)
--- 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