Merge branch 'for-3.15/sony' into for-3.15/hid-core-ll-transport-cleanup

[mirror_ubuntu-artful-kernel.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 669cc19573aeb78e825d75cf35d30b489a3b8cd0..7af9d0b5dea16f427987e234952c44cd53c540fc 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -617,25 +617,27 @@ config HID_SAMSUNG
        Support for Samsung InfraRed remote control or keyboards.
 
 config HID_SONY
-       tristate "Sony PS2/3 accessories"
+       tristate "Sony PS2/3/4 accessories"
        depends on USB_HID
        depends on NEW_LEDS
        depends on LEDS_CLASS
+       select POWER_SUPPLY
        ---help---
        Support for
 
          * Sony PS3 6-axis controllers
+         * Sony PS4 DualShock 4 controllers
          * Buzz controllers
          * Sony PS3 Blue-ray Disk Remote Control (Bluetooth)
          * Logitech Harmony adapter for Sony Playstation 3 (Bluetooth)
 
 config SONY_FF
-       bool "Sony PS2/3 accessories force feedback support"
+       bool "Sony PS2/3/4 accessories force feedback support" 
        depends on HID_SONY
        select INPUT_FF_MEMLESS
        ---help---
-       Say Y here if you have a Sony PS2/3 accessory and want to enable force
-       feedback support for it.
+       Say Y here if you have a Sony PS2/3/4 accessory and want to enable
+       force feedback support for it.
 
 config HID_SPEEDLINK
        tristate "Speedlink VAD Cezanne mouse support"