Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3', 'uclogic',...

[karo-tx-linux.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index fbf49503508d8aa79a5e0cc4c901b716bb1233b6..bf0617e47b892434120d782f864e55d8d588c6e6 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -527,6 +527,14 @@ config HID_PICOLCD_LEDS
        ---help---
          Provide access to PicoLCD's GPO pins via leds class.
 
+config HID_PICOLCD_CIR
+       bool "CIR via RC class" if EXPERT
+       default !EXPERT
+       depends on HID_PICOLCD
+       depends on HID_PICOLCD=RC_CORE || RC_CORE=y
+       ---help---
+         Provide access to PicoLCD's CIR interface via remote control (LIRC).
+
 config HID_PRIMAX
        tristate "Primax non-fully HID-compliant devices"
        depends on USB_HID
@@ -534,6 +542,15 @@ config HID_PRIMAX
        Support for Primax devices that are not fully compliant with the
        HID standard.
 
+config HID_PS3REMOTE
+       tristate "Sony PS3 BD Remote Control"
+       depends on BT_HIDP
+       ---help---
+       Support for the Sony PS3 Blue-ray Disk Remote Control and Logitech
+       Harmony Adapter for PS3, which connect over Bluetooth.
+
+       Support for the 6-axis controllers is provided by HID_SONY.
+
 config HID_ROCCAT
        tristate "Roccat device support"
        depends on USB_HID
@@ -561,7 +578,9 @@ config HID_SONY
        tristate "Sony PS3 controller"
        depends on USB_HID
        ---help---
-       Support for Sony PS3 controller.
+       Support for Sony PS3 6-axis controllers.
+
+       Support for the Sony PS3 BD Remote is provided by HID_PS3REMOTE.
 
 config HID_SPEEDLINK
        tristate "Speedlink VAD Cezanne mouse support"