Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[platform/kernel/linux-rpi.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 4bea966..a95a7cb 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -128,6 +128,8 @@ config HID_ACRUX_FF
 config HID_APPLE
        tristate "Apple {i,Power,Mac}Books"
        depends on HID
+       depends on LEDS_CLASS
+       depends on NEW_LEDS
        default !EXPERT
        help
        Support for some Apple devices which less or more break
@@ -940,6 +942,13 @@ config PLAYSTATION_FF
          Say Y here if you would like to enable force feedback support for
          PlayStation game controllers.
 
+config HID_RAZER
+       tristate "Razer non-fully HID-compliant devices"
+       depends on HID
+       help
+       Support for Razer devices that are not fully compliant with the
+       HID standard.
+
 config HID_PRIMAX
        tristate "Primax non-fully HID-compliant devices"
        depends on HID
@@ -995,6 +1004,16 @@ config HID_SEMITEK
        - Woo-dy
        - X-Bows Nature/Knight
 
+config HID_SIGMAMICRO
+       tristate "SiGma Micro-based keyboards"
+       depends on USB_HID
+       help
+         Support for keyboards that use the SiGma Micro (a.k.a SigmaChip) IC.
+
+         Supported devices:
+         - Landslides KR-700
+         - Rapoo V500
+
 config HID_SONY
        tristate "Sony PS2/3/4 accessories"
        depends on USB_HID