Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

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

diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 4e993425977558b4a79d408f023149d6b492339c..9705f3a00a3d944a5e3883e3cdf2fce4de20a2e8 100644 (file)
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -70,7 +70,7 @@ config MOUSE_PS2_SYNAPTICS
 config MOUSE_PS2_LIFEBOOK
        bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EMBEDDED
        default y
-       depends on MOUSE_PS2
+       depends on MOUSE_PS2 && X86
        help
          Say Y here if you have a Fujitsu B-series Lifebook PS/2
          TouchScreen connected to your system.
@@ -286,4 +286,10 @@ config MOUSE_GPIO
          To compile this driver as a module, choose M here: the
          module will be called gpio_mouse.
 
+config MOUSE_PXA930_TRKBALL
+       tristate "PXA930 Trackball mouse"
+       depends on CPU_PXA930 || CPU_PXA935
+       help
+         Say Y here to support PXA930 Trackball mouse.
+
 endif