Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

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

diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 2ccc114b3ff6b612e94d2ce6ac92c70126c3cdda..f996546fc443757151f4f7f09f95c996f4c576d9 100644 (file)
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -48,7 +48,7 @@ config MOUSE_PS2_ALPS
          If unsure, say Y.
 
 config MOUSE_PS2_LOGIPS2PP
-       bool "Logictech PS/2++ mouse protocol extension" if EMBEDDED
+       bool "Logitech PS/2++ mouse protocol extension" if EMBEDDED
        default y
        depends on MOUSE_PS2
        help
@@ -111,6 +111,7 @@ config MOUSE_SERIAL
 
 config MOUSE_APPLETOUCH
        tristate "Apple USB Touchpad support"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use an Apple USB Touchpad.
@@ -129,6 +130,29 @@ config MOUSE_APPLETOUCH
          To compile this driver as a module, choose M here: the
          module will be called appletouch.
 
+config MOUSE_BCM5974
+       tristate "Apple USB BCM5974 Multitouch trackpad support"
+       depends on USB_ARCH_HAS_HCD
+       select USB
+       help
+         Say Y here if you have an Apple USB BCM5974 Multitouch
+         trackpad.
+
+         The BCM5974 is the multitouch trackpad found in the Macbook
+         Air (JAN2008) and Macbook Pro Penryn (FEB2008) laptops.
+
+         It is also found in the IPhone (2007) and Ipod Touch (2008).
+
+         This driver provides multitouch functionality together with
+         the synaptics X11 driver.
+
+         The interface is currently identical to the appletouch interface,
+         for further information, see
+         <file:Documentation/input/appletouch.txt>.
+
+         To compile this driver as a module, choose M here: the
+         module will be called bcm5974.
+
 config MOUSE_INPORT
        tristate "InPort/MS/ATIXL busmouse"
        depends on ISA
@@ -215,4 +239,20 @@ config MOUSE_HIL
        help
          Say Y here to support HIL pointers.
 
+config MOUSE_GPIO
+       tristate "GPIO mouse"
+       depends on GENERIC_GPIO
+       select INPUT_POLLDEV
+       help
+         This driver simulates a mouse on GPIO lines of various CPUs (and some
+         other chips).
+
+         Say Y here if your device has buttons or a simple joystick connected
+         directly to GPIO lines. Your board-specific setup logic must also
+         provide a platform device and platform data saying which GPIOs are
+         used.
+
+         To compile this driver as a module, choose M here: the
+         module will be called gpio_mouse.
+
 endif