diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2020-12-16 13:42:47 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-12-16 13:42:47 +0300 |
| commit | 4d3d3d70cc9072acb2e643102421923ef90fdd97 (patch) | |
| tree | 7b455f84b87ffbfbac63d7bdeb5ed4f12f06cdc1 /drivers/hid/Kconfig | |
| parent | 47cdd7f139dc3e896a627e8c0e98d0501555a889 (diff) | |
| parent | cc894ac553605c9193a7a94372ff2f8af5766f46 (diff) | |
| download | linux-4d3d3d70cc9072acb2e643102421923ef90fdd97.tar.xz | |
Merge branch 'for-5.11/sony' into for-linus
- DS4 power and firmware reporting fixes, from Roderick Colenbrander
- support for ghlive PS3/WII u dongles, from Pascal Giard
Diffstat (limited to 'drivers/hid/Kconfig')
| -rw-r--r-- | drivers/hid/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index fff3963ba02b..7bdda1b5b221 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -907,6 +907,7 @@ config HID_SONY * Buzz controllers * 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 config SONY_FF bool "Sony PS2/3/4 accessories force feedback support" |