Merge branches 'for-4.8/alps', 'for-4.8/apple', 'for-4.8/i2c-hid', 'for-4.8/uhid...

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

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 411722570035b0c2d3375991e82008c0d61a08fc..a8e480849a32602de037467ef8f1d4e552920027 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -134,6 +134,16 @@ config HID_APPLEIR
 
        Say Y here if you want support for Apple infrared remote control.
 
+config HID_ASUS
+       tristate "Asus"
+       depends on I2C_HID
+       ---help---
+       Support for Asus notebook built-in keyboard via i2c.
+
+       Supported devices:
+       - EeeBook X205TA
+       - VivoBook E200HA
+
 config HID_AUREAL
        tristate "Aureal"
        depends on HID
@@ -926,6 +936,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