diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-03-14 15:30:16 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-03-14 15:30:16 +0100 |
| commit | 65ab2fc479fa8554e26d6d1726a4ebe6f29a73be (patch) | |
| tree | a90294685f0e2a445397a6d9e7e85ac7949ebf1d /drivers/hid/Kconfig | |
| parent | 866e4797b4e8100f5abcf2bfd3f7843dc40306cd (diff) | |
| parent | dccf2f65e68d2f5b5e86ae6cf9796cf558694953 (diff) | |
Merge branch 'for-3.15/sony' into for-3.15/hid-core-ll-transport-cleanup
Diffstat (limited to 'drivers/hid/Kconfig')
| -rw-r--r-- | drivers/hid/Kconfig | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 669cc19573ae..7af9d0b5dea1 100644 --- 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" |