diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 17:21:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 17:21:02 -0700 |
| commit | 54205209732a05f51f5fbb3eb3e5c36ac81e79d9 (patch) | |
| tree | 4992850c7d5d5ed4034cbd4fe5f5ea23aeff317e /drivers/usb/input/Kconfig | |
| parent | 6d8de3a26b5c20b04a9317b4446582167d5883da (diff) | |
| parent | b71e318cdb1dc301d734fdd4983dfc6dc167235a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/input/Kconfig')
| -rw-r--r-- | drivers/usb/input/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig index 298e4a25e3d..482c4be521f 100644 --- 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 |