HID: hid-multitouch: migrate Cando dual touch panels to hid-multitouch

This patch merges hid-cando into the unified multitouch driver.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Reviewed-by: Stéphane Chatty <chatty@enac.fr>
Reviewed-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 3c72f16e725f..1edb0bd72a60 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -100,12 +100,6 @@ 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 Cymotion keyboard" if EXPERT
         depends on USB_HID
@@ -320,6 +314,7 @@ config HID_MULTITOUCH
           Generic support for HID multitouch panels.
 
           Say Y here if you have one of the following devices:
+          - Cando dual touch panel
           - Cypress TrueTouch panels
           - Hanvon dual touch panels
           - IrTouch Infrared USB panels