fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 5246b35..c7d8875 100644 (file)
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -6,14 +6,14 @@ comment "USB Input Devices"
 
 config USB_HID
        tristate "USB Human Interface Device (full HID) support"
 
 config USB_HID
        tristate "USB Human Interface Device (full HID) support"

-       depends on USB
+       default y
+       depends on USB && INPUT
+       select HID

        ---help---
        ---help---

-         Say Y here if you want full HID support to connect keyboards,
+         Say Y here if you want full HID support to connect USB keyboards,

          mice, joysticks, graphic tablets, or any other HID based devices
          mice, joysticks, graphic tablets, or any other HID based devices

-         to your computer via USB. You also need to select HID Input layer
-         support (below) if you want to use keyboards, mice, joysticks and
-         the like ... as well as Uninterruptible Power Supply (UPS) and
-         monitor control devices.
+         to your computer via USB, as well as Uninterruptible Power Supply
+         (UPS) and monitor control devices.

 
          You can't use this driver and the HIDBP (Boot Protocol) keyboard
          and mouse drivers at the same time. More information is available:
 
          You can't use this driver and the HIDBP (Boot Protocol) keyboard
          and mouse drivers at the same time. More information is available:


@@ -27,20 +27,10 @@ config USB_HID
 comment "Input core support is needed for USB HID input layer or HIDBP support"
        depends on USB_HID && INPUT=n
 
 comment "Input core support is needed for USB HID input layer or HIDBP support"
        depends on USB_HID && INPUT=n
 

-config USB_HIDINPUT
-       bool "HID input layer support"
-       default y
-       depends on INPUT && USB_HID
-       help
-         Say Y here if you want to use a USB keyboard, mouse or joystick,
-         or any other HID input device.
-
-         If unsure, say Y.
-

 config USB_HIDINPUT_POWERBOOK
        bool "Enable support for iBook/PowerBook special keys"
        default n
 config USB_HIDINPUT_POWERBOOK
        bool "Enable support for iBook/PowerBook special keys"
        default n

-       depends on USB_HIDINPUT
+       depends on USB_HID

        help
          Say Y here if you want support for the special keys (Fn, Numlock) on
          Apple iBooks and PowerBooks.
        help
          Say Y here if you want support for the special keys (Fn, Numlock) on
          Apple iBooks and PowerBooks.


@@ -49,7 +39,7 @@ config USB_HIDINPUT_POWERBOOK
 
 config HID_FF
        bool "Force feedback support (EXPERIMENTAL)"
 
 config HID_FF
        bool "Force feedback support (EXPERIMENTAL)"

-       depends on USB_HIDINPUT && EXPERIMENTAL
+       depends on USB_HID && EXPERIMENTAL

        help
          Say Y here is you want force feedback support for a few HID devices.
          See below for a list of supported devices.
        help
          Say Y here is you want force feedback support for a few HID devices.
          See below for a list of supported devices.


@@ -60,16 +50,17 @@ config HID_FF
          If unsure, say N.
 
 config HID_PID
          If unsure, say N.
 
 config HID_PID

-       bool "PID Devices (Microsoft Sidewinder Force Feedback 2)"
+       bool "PID device support"

        depends on HID_FF
        help
        depends on HID_FF
        help

-         Say Y here if you have a PID-compliant joystick and wish to enable force
-         feedback for it. The Microsoft Sidewinder Force Feedback 2 is one such
-         device.
+         Say Y here if you have a PID-compliant device and wish to enable force
+         feedback for it. Microsoft Sidewinder Force Feedback 2 is one of such
+         devices.

 
 config LOGITECH_FF
        bool "Logitech WingMan *3D support"
        depends on HID_FF
 
 config LOGITECH_FF
        bool "Logitech WingMan *3D support"
        depends on HID_FF

+       select INPUT_FF_MEMLESS if USB_HID

        help
          Say Y here if you have one of these devices:
          - Logitech WingMan Cordless RumblePad
        help
          Say Y here if you have one of these devices:
          - Logitech WingMan Cordless RumblePad


@@ -81,12 +72,21 @@ config LOGITECH_FF
 config THRUSTMASTER_FF
        bool "ThrustMaster FireStorm Dual Power 2 support (EXPERIMENTAL)"
        depends on HID_FF && EXPERIMENTAL
 config THRUSTMASTER_FF
        bool "ThrustMaster FireStorm Dual Power 2 support (EXPERIMENTAL)"
        depends on HID_FF && EXPERIMENTAL

+       select INPUT_FF_MEMLESS if USB_HID

        help
          Say Y here if you have a THRUSTMASTER FireStore Dual Power 2,
          and want to enable force feedback support for it.
          Note: if you say N here, this device will still be supported, but without
          force feedback.
 
        help
          Say Y here if you have a THRUSTMASTER FireStore Dual Power 2,
          and want to enable force feedback support for it.
          Note: if you say N here, this device will still be supported, but without
          force feedback.
 

+config ZEROPLUS_FF
+       bool "Zeroplus based game controller support"
+       depends on HID_FF
+       select INPUT_FF_MEMLESS if USB_HID
+       help
+         Say Y here if you have a Zeroplus based game controller and want to
+         enable force feedback for it.
+

 config USB_HIDDEV
        bool "/dev/hiddev raw HID device support"
        depends on USB_HID
 config USB_HIDDEV
        bool "/dev/hiddev raw HID device support"
        depends on USB_HID


@@ -200,45 +200,59 @@ config USB_POWERMATE
          To compile this driver as a module, choose M here: the
          module will be called 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---
        depends on USB && INPUT
        ---help---

-         Say Y here if you want to use a MicroTouch (Now 3M) USB 
-         Touchscreen controller.
+         USB Touchscreen driver for:
+         - eGalax Touchkit USB (also includes eTurboTouch CT-410/510/700)
+         - PanJit TouchSet USB
+         - 3M MicroTouch USB (EX II series)
+         - ITM
+         - some other eTurboTouch
+         - Gunze AHL61
+         - DMC TSC-10/25

 
 

-         See <file:Documentation/usb/mtouch.txt> for additional information.
+         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
 
          To compile this driver as a module, choose M here: the

-         module will be called mtouchusb.
+         module will be called usbtouchscreen.

 
 

-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.
+config USB_TOUCHSCREEN_EGALAX
+       default y
+       bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED
+       depends on USB_TOUCHSCREEN

 
 

-         This touchscreen is used in LG 1510SF monitors.
+config USB_TOUCHSCREEN_PANJIT
+       default y
+       bool "PanJit device support" if EMBEDDED
+       depends on USB_TOUCHSCREEN

 
 

-         To compile this driver as a module, choose M here: the
-         module will be called itmtouch.
+config USB_TOUCHSCREEN_3M
+       default y
+       bool "3M/Microtouch EX II series device support" if EMBEDDED
+       depends on USB_TOUCHSCREEN

 
 

-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_ITM
+       default y
+       bool "ITM device support" if EMBEDDED
+       depends on USB_TOUCHSCREEN

 
 

-         The driver has been tested on a Xenarc 700TSV monitor
-         with eGalax touchscreen.
+config USB_TOUCHSCREEN_ETURBO
+       default y
+       bool "eTurboTouch (non-eGalax compatible) 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_GUNZE
+       default y
+       bool "Gunze AHL61 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_DMC_TSC10
+       default y
+       bool "DMC TSC-10/25 device support" if EMBEDDED
+       depends on USB_TOUCHSCREEN

 
 config USB_YEALINK
        tristate "Yealink usb-p1k voip phone"
 
 config USB_YEALINK
        tristate "Yealink usb-p1k voip phone"