summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Kconfig
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-06-13 12:03:49 +0200
committerJiri Kosina <jkosina@suse.cz>2013-06-13 12:03:49 +0200
commit078328da5d5dfbd2b1333eb545bd89d6dfa984ef (patch)
treef27e524bca2e6631f788b0ebbf0e44ae03db5d5d /drivers/hid/Kconfig
parent40e32ee6e475852f532c847ed1804b87f6531a67 (diff)
downloadop-kernel-dev-078328da5d5dfbd2b1333eb545bd89d6dfa984ef.zip
op-kernel-dev-078328da5d5dfbd2b1333eb545bd89d6dfa984ef.tar.gz
HID: fold ps3remote driver into generic Sony driver
Let's follow the structure we are trying to keep for most of the specific HID drivers, and let the separation follow the producing vendor. Merge functionality provided by ps3remote driver into hid-sony. Tested-by: David Dillow <dave@thedillows.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r--drivers/hid/Kconfig15
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 5bad26e..8280eba 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -561,15 +561,6 @@ 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 HID
- ---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
@@ -600,11 +591,11 @@ config HID_SONY
depends on LEDS_CLASS
---help---
Support for
-
+
* Sony PS3 6-axis controllers
* Buzz controllers
-
- Support for the Sony PS3 BD Remote is provided by HID_PS3REMOTE.
+ * Sony PS3 Blue-ray Disk Remote Control (Bluetooth)
+ * Logitech Harmony adapter for Sony Playstation 3 (Bluetooth)
config HID_SPEEDLINK
tristate "Speedlink VAD Cezanne mouse support"
OpenPOWER on IntegriCloud