Merge ../linus

[linux-2.6] / drivers / usb / input / Kconfig

diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 509dd0a..650103b 100644 (file)
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -37,6 +37,16 @@ config USB_HIDINPUT
 
          If unsure, say Y.
 
+config USB_HIDINPUT_POWERBOOK
+       bool "Enable support for iBook/PowerBook special keys"
+       default n
+       depends on USB_HIDINPUT
+       help
+         Say Y here if you want support for the special keys (Fn, Numlock) on
+         Apple iBooks and PowerBooks.
+
+         If unsure, say N.
+
 config HID_FF
        bool "Force feedback support (EXPERIMENTAL)"
        depends on USB_HIDINPUT && EXPERIMENTAL
@@ -190,45 +200,41 @@ config USB_POWERMATE
          To compile this driver as a module, choose M here: the
          module will be called powermate.
 
-config USB_MTOUCH
-       tristate "MicroTouch USB Touchscreen Driver"
+config USB_TOUCHSCREEN
+       tristate "USB Touchscreen Driver"
        depends on USB && INPUT
        ---help---
-         Say Y here if you want to use a MicroTouch (Now 3M) USB 
-         Touchscreen controller.
-
-         See <file:Documentation/usb/mtouch.txt> for additional information.
+         USB Touchscreen driver for:
+         - eGalax Touchkit USB
+         - PanJit TouchSet USB
+         - 3M MicroTouch USB
+         - ITM
 
-         To compile this driver as a module, choose M here: the
-         module will be called mtouchusb.
-
-config USB_ITMTOUCH
-       tristate "ITM Touch USB Touchscreen Driver"
-       depends on USB && INPUT
-       ---help---
-         Say Y here if you want to use a ITM Touch USB
-         Touchscreen controller.
-
-         This touchscreen is used in LG 1510SF monitors.
+         Have a look at <http://linux.chapter7.ch/touchkit/> for
+         a usage description and the required user-space stuff.
 
          To compile this driver as a module, choose M here: the
-         module will be called itmtouch.
+         module will be called usbtouchscreen.
 
-config USB_EGALAX
-       tristate "eGalax TouchKit USB Touchscreen Driver"
-       depends on USB && INPUT
-       ---help---
-         Say Y here if you want to use a eGalax TouchKit USB
-         Touchscreen controller.
+config USB_TOUCHSCREEN_EGALAX
+       default y
+       bool "eGalax device support" if EMBEDDED
+       depends on USB_TOUCHSCREEN
 
-         The driver has been tested on a Xenarc 700TSV monitor
-         with eGalax touchscreen.
+config USB_TOUCHSCREEN_PANJIT
+       default y
+       bool "PanJit device support" if EMBEDDED
+       depends on USB_TOUCHSCREEN
 
-         Have a look at <http://linux.chapter7.ch/touchkit/> for
-         a usage description and the required user-space stuff.
+config USB_TOUCHSCREEN_3M
+       default y
+       bool "3M/Microtouch device support" if EMBEDDED
+       depends on USB_TOUCHSCREEN
 
-         To compile this driver as a module, choose M here: the
-         module will be called touchkitusb.
+config USB_TOUCHSCREEN_ITM
+       default y
+       bool "ITM device support" if EMBEDDED
+       depends on USB_TOUCHSCREEN
 
 config USB_YEALINK
        tristate "Yealink usb-p1k voip phone"