Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

[sfrench/cifs-2.6.git] / drivers / usb / input / Kconfig

diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index fd59f6bdd67faa72b9964c0884334f43a22e1256..482c4be521f55424a68efe4cc328e93cd595c1cd 100644 (file)
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -230,6 +230,20 @@ config USB_EGALAX
          To compile this driver as a module, choose M here: the
          module will be called touchkitusb.
 
+config USB_YEALINK
+       tristate "Yealink usb-p1k voip phone"
+       depends on USB && INPUT && EXPERIMENTAL
+       ---help---
+         Say Y here if you want to enable keyboard and LCD functions of the
+         Yealink usb-p1k usb phones. The audio part is enabled by the generic
+         usb sound driver, so you might want to enable that as well.
+
+         For information about how to use these additional functions, see
+         <file:Documentation/input/yealink.txt>.
+
+         To compile this driver as a module, choose M here: the module will be
+         called yealink.
+
 config USB_XPAD
        tristate "X-Box gamepad support"
        depends on USB && INPUT
@@ -259,3 +273,16 @@ config USB_ATI_REMOTE
          To compile this driver as a module, choose M here: the module will be
          called ati_remote.
 
+config USB_KEYSPAN_REMOTE
+       tristate "Keyspan DMR USB remote control (EXPERIMENTAL)"
+       depends on USB && INPUT && EXPERIMENTAL
+       ---help---
+         Say Y here if you want to use a Keyspan DMR USB remote control.
+         Currently only the UIA-11 type of receiver has been tested.  The tag
+         on the receiver that connects to the USB port should have a P/N that
+         will tell you what type of DMR you have.  The UIA-10 type is not
+         supported at this time.  This driver maps all buttons to keypress
+         events.
+
+         To compile this driver as a module, choose M here: the module will
+         be called keyspan_remote.