aboutsummaryrefslogtreecommitdiff
path: root/drivers/hid/Kconfig
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-05-19 14:26:44 +0200
committerJiri Kosina <jkosina@suse.cz>2010-05-19 14:26:44 +0200
commit77933c354c6c0e4b6abcb417518e84b8fd9b7ae4 (patch)
treef05d0a426959ee01ce74c1f4733076d3b0ee4c8d /drivers/hid/Kconfig
parent896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68 (diff)
parentc872b0fccc6e086beea0a7b3b4123b7d0e75a868 (diff)
downloadlinux-2.6.38-lt-ux500-77933c354c6c0e4b6abcb417518e84b8fd9b7ae4.tar.gz
Merge branch 'egalax' into for-linus
Conflicts: 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 98c4ff75218..4ea926a21bc 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -128,6 +128,12 @@ config DRAGONRISE_FF
Say Y here if you want to enable force feedback support for DragonRise Inc.
game controllers.
+config HID_EGALAX
+ tristate "eGalax multi-touch panel"
+ depends on USB_HID
+ ---help---
+ Support for the eGalax dual-touch panel
+
config HID_EZKEY
tristate "Ezkey" if EMBEDDED
depends on USB_HID