Merge branch 'next' into for-linus

[pandora-kernel.git] / drivers / input / mouse / Kconfig

diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 9705f3a..c66cc3d 100644 (file)
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -17,7 +17,7 @@ config MOUSE_PS2
        default y
        select SERIO
        select SERIO_LIBPS2
-       select SERIO_I8042 if X86_PC
+       select SERIO_I8042 if X86
        select SERIO_GSCPS2 if GSC
        help
          Say Y here if you have a PS/2 mouse connected to your system. This
@@ -292,4 +292,15 @@ config MOUSE_PXA930_TRKBALL
        help
          Say Y here to support PXA930 Trackball mouse.
 
+config MOUSE_MAPLE
+       tristate "Maple mouse (for the Dreamcast)"
+       depends on MAPLE
+       help
+         This driver supports the Maple mouse on the SEGA Dreamcast.
+
+         Most Dreamcast users, who have a mouse, will say Y here.
+
+         To compile this driver as a module choose M here: the module will be
+         called maplemouse.
+
 endif