Merge remote-tracking branch 'torvalds/master' into perf/core

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

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 09fa75a2b289e5e31c457d85fa4c6db90c3e86ed..786b71ef7738aa2f60059e26ceecfec5e211c261 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -853,6 +853,24 @@ config HID_PLANTRONICS
 
          Say M here if you may ever plug in a Plantronics USB audio device.
 
+config HID_PLAYSTATION
+       tristate "PlayStation HID Driver"
+       depends on HID
+       select CRC32
+       select POWER_SUPPLY
+       help
+         Provides support for Sony PS5 controllers including support for
+         its special functionalities e.g. touchpad, lights and motion
+         sensors.
+
+config PLAYSTATION_FF
+       bool "PlayStation force feedback support"
+       depends on HID_PLAYSTATION
+       select INPUT_FF_MEMLESS
+       help
+         Say Y here if you would like to enable force feedback support for
+         PlayStation game controllers.
+
 config HID_PRIMAX
        tristate "Primax non-fully HID-compliant devices"
        depends on HID
@@ -909,6 +927,7 @@ config HID_SONY
          * Sony PS3 Blue-ray Disk Remote Control (Bluetooth)
          * Logitech Harmony adapter for Sony Playstation 3 (Bluetooth)
          * Guitar Hero Live PS3 and Wii U guitar dongles
+         * Guitar Hero PS3 and PC guitar dongles
 
 config SONY_FF
        bool "Sony PS2/3/4 accessories force feedback support"