Merge branch 'dmi/master'

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

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 78ac4811bd3c0c0683e62bfe424c43c0fba4c8a9..940bd6e553e5b30d18d38b291a5c83e60bb32470 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -862,6 +862,7 @@ config HID_WACOM
        select POWER_SUPPLY
        select NEW_LEDS
        select LEDS_CLASS
+       select LEDS_TRIGGERS
        help
          Say Y here if you want to use the USB or BT version of the Wacom Intuos
          or Graphire tablet.
@@ -967,4 +968,6 @@ source "drivers/hid/usbhid/Kconfig"
 
 source "drivers/hid/i2c-hid/Kconfig"
 
+source "drivers/hid/intel-ish-hid/Kconfig"
+
 endmenu