Merge branch 'for-4.8/hid-led' into for-linus

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

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index e33ccef..78ac481 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -398,6 +398,7 @@ config HID_LED
        - Dream Cheeky Webmail Notifier and Friends Alert
        - ThingM blink(1)
        - Delcom Visual Signal Indicator Generation 2
+       - Greynut Luxafor
 
        To compile this driver as a module, choose M here: the
        module will be called hid-led.
@@ -950,6 +951,14 @@ config HID_SENSOR_CUSTOM_SENSOR
          standard sensors.
          Select this config option for custom/generic sensor support.
 
+config HID_ALPS
+       tristate "Alps HID device support"
+       depends on HID
+       ---help---
+       Support for Alps I2C HID touchpads and StickPointer.
+       Say Y here if you have a Alps touchpads over i2c-hid or usbhid
+       and want support for its special functionalities.
+
 endmenu
 
 endif # HID