Merge branch 'egalax' into for-linus

Conflicts:
	drivers/hid/hid-ids.h

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 98c4ff752186..4ea926a21bc8 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