2 files changed, 7 insertions, 59 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index a421abdd1ab7..5a763d5a7bf8 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -476,59 +476,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_SAMSUNG
         tristate "Samsung InfraRed remote control or keyboards"
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 8aefdc963cce..7d926719e21b 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -64,14 +64,9 @@ obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl.o
 obj-$(CONFIG_HID_PETALYNX)      += hid-petalynx.o
 obj-$(CONFIG_HID_PICOLCD)       += hid-picolcd.o
 obj-$(CONFIG_HID_PRIMAX)        += hid-primax.o
-obj-$(CONFIG_HID_ROCCAT)        += hid-roccat.o
-obj-$(CONFIG_HID_ROCCAT_COMMON) += hid-roccat-common.o
-obj-$(CONFIG_HID_ROCCAT_ARVO)   += hid-roccat-arvo.o
-obj-$(CONFIG_HID_ROCCAT_ISKU)   += hid-roccat-isku.o
-obj-$(CONFIG_HID_ROCCAT_KONE)   += hid-roccat-kone.o
-obj-$(CONFIG_HID_ROCCAT_KONEPLUS)       += hid-roccat-koneplus.o
-obj-$(CONFIG_HID_ROCCAT_KOVAPLUS)       += hid-roccat-kovaplus.o
-obj-$(CONFIG_HID_ROCCAT_PYRA)   += hid-roccat-pyra.o
+obj-$(CONFIG_HID_ROCCAT)        += hid-roccat.o hid-roccat-common.o \
+        hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \
+        hid-roccat-koneplus.o hid-roccat-kovaplus.o hid-roccat-pyra.o
 obj-$(CONFIG_HID_SAMSUNG)       += hid-samsung.o
 obj-$(CONFIG_HID_SMARTJOYPLUS)  += hid-sjoy.o
 obj-$(CONFIG_HID_SONY)          += hid-sony.o