HID: multitouch: merge quanta driver into hid-multitouch

[linux-flexiantxendom0.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 4c09210..b5e1012 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -351,6 +351,7 @@ config HID_MULTITOUCH
          - MosArt dual-touch panels
          - PenMount dual touch panels
          - Pixcir dual touch panels
+         - Quanta panels
          - eGalax dual-touch panels, including the Joojoo and Wetab tablets
          - Stantum multitouch panels
          - Touch International Panels
@@ -468,12 +469,6 @@ config HID_PRIMAX
        Support for Primax devices that are not fully compliant with the
        HID standard.
 
-config HID_QUANTA
-       tristate "Quanta Optical Touch panels"
-       depends on USB_HID
-       ---help---
-       Support for Quanta Optical Touch dual-touch panels.
-
 config HID_ROCCAT
        tristate "Roccat special event support"
        depends on USB_HID