aboutsummaryrefslogtreecommitdiff
path: root/drivers/hid/Kconfig
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-05-19 14:09:31 +0200
committerJiri Kosina <jkosina@suse.cz>2010-05-19 14:09:31 +0200
commit896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68 (patch)
tree42f625d04b9fbff4cb93968f18efd91601df15a5 /drivers/hid/Kconfig
parentef77ad5e67447b3744574c29b97da6677d6d3f18 (diff)
parentba4d8abb31def963f49b7c239a8acce57fe1d1cc (diff)
downloadlinux-2.6.38-lt-ux500-896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68.tar.gz
Merge branch 'cando' into for-linus
Conflicts: drivers/hid/hid-core.c drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r--drivers/hid/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index ac8e12d00c0..98c4ff75218 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -86,6 +86,12 @@ config HID_BELKIN
---help---
Support for Belkin Flip KVM and Wireless keyboard.
+config HID_CANDO
+ tristate "Cando dual touch panel"
+ depends on USB_HID
+ ---help---
+ Support for Cando dual touch panel.
+
config HID_CHERRY
tristate "Cherry" if EMBEDDED
depends on USB_HID