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

[sfrench/cifs-2.6.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 3872e03d9a59f8db7ad57bd980f36a2f6c7b57d6..1ecb5124421c00cd99d1caede390cc7ce1d5ff39 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -273,6 +273,15 @@ config HID_CP2112
        and gpiochip to expose these functions of the CP2112. The
        customizable USB descriptor fields are exposed as sysfs attributes.
 
+config HID_CREATIVE_SB0540
+       tristate "Creative SB0540 infrared receiver"
+       depends on USB_HID
+       help
+       Support for Creative infrared SB0540-compatible remote controls, such
+       as the RM-1500 and RM-1800 remotes.
+
+       Say Y here if you want support for Creative SB0540 infrared receiver.
+
 config HID_CYPRESS
        tristate "Cypress mouse and barcode readers"
        depends on HID
@@ -376,7 +385,7 @@ config HOLTEK_FF
 
 config HID_GOOGLE_HAMMER
        tristate "Google Hammer Keyboard"
-       depends on USB_HID && LEDS_CLASS && MFD_CROS_EC
+       depends on USB_HID && LEDS_CLASS && CROS_EC
        ---help---
        Say Y here if you have a Google Hammer device.