Merge branch 'upstream' into for-linus

[net-next-2.6.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index ecc11405922a4bf3681030d7c4258b4e92700cbb..d51f0144a3b9d1f4dbd95ebc57c278db2e66e9e6 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -353,9 +353,18 @@ config HID_QUANTA
        ---help---
        Support for Quanta Optical Touch dual-touch panels.
 
+config HID_ROCCAT
+       tristate "Roccat special event support"
+       depends on USB_HID
+       ---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_KONE
        tristate "Roccat Kone Mouse support"
        depends on USB_HID
+       select HID_ROCCAT
        ---help---
        Support for Roccat Kone mouse.