Merge branch 'upstream' into for-linus

[cascardo/linux.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 3d14e4f..a3d0332 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -359,7 +359,9 @@ config HID_MULTITOUCH
          - LG Display panels (Dell ST2220Tc)
          - Lumio CrystalTouch panels
          - MosArt dual-touch panels
+         - Panasonic multitouch panels
          - PenMount dual touch panels
+         - Perixx Peripad 701 touchpad
          - PixArt optical touch screen
          - Pixcir dual touch panels
          - Quanta panels
@@ -481,59 +483,12 @@ config HID_PRIMAX
        HID standard.
 
 config HID_ROCCAT
-       tristate "Roccat special event support"
+       tristate "Roccat device support"
        depends on USB_HID
-       select HID_ROCCAT_COMMON
        ---help---
-       Support for Roccat special events.
-       Say Y here if you have a Roccat mouse or keyboard and want OSD or
-       macro execution support.
-
-config HID_ROCCAT_COMMON
-       tristate
-       depends on HID_ROCCAT
-
-config HID_ROCCAT_ARVO
-       tristate "Roccat Arvo keyboard support"
-       depends on USB_HID
-       depends on HID_ROCCAT
-       ---help---
-       Support for Roccat Arvo keyboard.
-
-config HID_ROCCAT_ISKU
-       tristate "Roccat Isku keyboard support"
-       depends on USB_HID
-       depends on HID_ROCCAT
-       ---help---
-       Support for Roccat Isku keyboard.
-
-config HID_ROCCAT_KONE
-       tristate "Roccat Kone Mouse support"
-       depends on USB_HID
-       depends on HID_ROCCAT
-       ---help---
-       Support for Roccat Kone mouse.
-
-config HID_ROCCAT_KONEPLUS
-       tristate "Roccat Kone[+] mouse support"
-       depends on USB_HID
-       depends on HID_ROCCAT
-       ---help---
-       Support for Roccat Kone[+] mouse.
-
-config HID_ROCCAT_KOVAPLUS
-       tristate "Roccat Kova[+] mouse support"
-       depends on USB_HID
-       depends on HID_ROCCAT
-       ---help---
-       Support for Roccat Kova[+] mouse.
-
-config HID_ROCCAT_PYRA
-       tristate "Roccat Pyra mouse support"
-       depends on USB_HID
-       depends on HID_ROCCAT
-       ---help---
-       Support for Roccat Pyra mouse.
+       Support for Roccat devices.
+       Say Y here if you have a Roccat mouse or keyboard and want
+       support for its special functionalities.
 
 config HID_SAITEK
        tristate "Saitek non-fully HID-compliant devices"