diff options
author | Frank Praznik <frank.praznik@oh.rr.com> | 2014-02-01 10:39:58 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2014-02-04 09:23:37 -0500 |
commit | e4321c5cebbee9fc4988223af9aa1298d939d388 (patch) | |
tree | 813375b219ba8804a24dd5c9aec27828c8497b40 /drivers/hid/Kconfig | |
parent | 695baaa7e20dca5826eea52cf49ffe66a353628a (diff) |
HID: Kconfig updates for the Sony module
Update the HID_SONY config with 'select POWER_SUPPLY' to fix build issues
relating to undefined references to the power_supply_* functions in
certain build configurations.
Update the description text to reflect that Playstation 4 controllers are now
supported.
[jkosina@suse.cz: drop the POWER_SUPPLY hunk, as I've already fixed that]
Signed-off-by: Frank Praznik <frank.praznik@oh.rr.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r-- | drivers/hid/Kconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index f5da18bd91ca..0c3de7ae6946 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -608,7 +608,7 @@ config HID_SAMSUNG | |||
608 | Support for Samsung InfraRed remote control or keyboards. | 608 | Support for Samsung InfraRed remote control or keyboards. |
609 | 609 | ||
610 | config HID_SONY | 610 | config HID_SONY |
611 | tristate "Sony PS2/3 accessories" | 611 | tristate "Sony PS2/3/4 accessories" |
612 | depends on USB_HID | 612 | depends on USB_HID |
613 | depends on NEW_LEDS | 613 | depends on NEW_LEDS |
614 | depends on LEDS_CLASS | 614 | depends on LEDS_CLASS |
@@ -617,17 +617,18 @@ config HID_SONY | |||
617 | Support for | 617 | Support for |
618 | 618 | ||
619 | * Sony PS3 6-axis controllers | 619 | * Sony PS3 6-axis controllers |
620 | * Sony PS4 DualShock 4 controllers | ||
620 | * Buzz controllers | 621 | * Buzz controllers |
621 | * Sony PS3 Blue-ray Disk Remote Control (Bluetooth) | 622 | * Sony PS3 Blue-ray Disk Remote Control (Bluetooth) |
622 | * Logitech Harmony adapter for Sony Playstation 3 (Bluetooth) | 623 | * Logitech Harmony adapter for Sony Playstation 3 (Bluetooth) |
623 | 624 | ||
624 | config SONY_FF | 625 | config SONY_FF |
625 | bool "Sony PS2/3 accessories force feedback support" | 626 | bool "Sony PS2/3/4 accessories force feedback support" |
626 | depends on HID_SONY | 627 | depends on HID_SONY |
627 | select INPUT_FF_MEMLESS | 628 | select INPUT_FF_MEMLESS |
628 | ---help--- | 629 | ---help--- |
629 | Say Y here if you have a Sony PS2/3 accessory and want to enable force | 630 | Say Y here if you have a Sony PS2/3/4 accessory and want to enable |
630 | feedback support for it. | 631 | force feedback support for it. |
631 | 632 | ||
632 | config HID_SPEEDLINK | 633 | config HID_SPEEDLINK |
633 | tristate "Speedlink VAD Cezanne mouse support" | 634 | tristate "Speedlink VAD Cezanne mouse support" |