linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] HID: Kconfig updates for the Sony module
@ 2014-02-01 15:39 Frank Praznik
  2014-02-04 14:24 ` Jiri Kosina
  0 siblings, 1 reply; 2+ messages in thread
From: Frank Praznik @ 2014-02-01 15:39 UTC (permalink / raw)
  To: linux-input; +Cc: jkosina, Frank Praznik

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.

Signed-off-by: Frank Praznik <frank.praznik@oh.rr.com>

---

 Apply to jikos/hid.git/for-3.15/sony
 
 This should fix the errors that the buildbot was reporting.

 drivers/hid/Kconfig | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index f722001..0e4cdc2 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -608,25 +608,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"
-- 
1.8.5.3


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] HID: Kconfig updates for the Sony module
  2014-02-01 15:39 [PATCH] HID: Kconfig updates for the Sony module Frank Praznik
@ 2014-02-04 14:24 ` Jiri Kosina
  0 siblings, 0 replies; 2+ messages in thread
From: Jiri Kosina @ 2014-02-04 14:24 UTC (permalink / raw)
  To: Frank Praznik; +Cc: linux-input

On Sat, 1 Feb 2014, Frank Praznik wrote:

> 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.
> 
> Signed-off-by: Frank Praznik <frank.praznik@oh.rr.com>

I have dropped the POWER_SUPPLY part of the patch, as I've already fixed 
that in my tree as a followup to Fengguang's report.

I have applied the rest, thanks.

-- 
Jiri Kosina
SUSE Labs

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-02-04 14:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-01 15:39 [PATCH] HID: Kconfig updates for the Sony module Frank Praznik
2014-02-04 14:24 ` Jiri Kosina

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).