Merge branches 'for-5.7/upstream-fixes', 'for-5.8/apple', 'for-5.8/asus', 'for-5...

[platform/kernel/linux-starfive.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 34f0737..443c5cb 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -42,7 +42,7 @@ config HIDRAW
        ---help---
        Say Y here if you want to support HID devices (from the USB
        specification standpoint) that aren't strictly user interface
-       devices, like monitor controls and Uninterruptable Power Supplies.
+       devices, like monitor controls and Uninterruptible Power Supplies.
 
        This module supports these devices separately using a separate
        event interface on /dev/hidraw.
@@ -149,6 +149,7 @@ config HID_APPLEIR
 
 config HID_ASUS
        tristate "Asus"
+       depends on USB_HID
        depends on LEDS_CLASS
        depends on ASUS_WMI || ASUS_WMI=n
        select POWER_SUPPLY
@@ -538,14 +539,14 @@ config HID_LOGITECH
        Support for Logitech devices that are not fully compliant with HID standard.
 
 config HID_LOGITECH_DJ
-       tristate "Logitech Unifying receivers full support"
+       tristate "Logitech receivers full support"
        depends on USB_HID
        depends on HIDRAW
        depends on HID_LOGITECH
        select HID_LOGITECH_HIDPP
        ---help---
-       Say Y if you want support for Logitech Unifying receivers and devices.
-       Unifying receivers are capable of pairing up to 6 Logitech compliant
+       Say Y if you want support for Logitech receivers and devices.
+       Logitech receivers are capable of pairing multiple Logitech compliant
        devices to the same receiver. Without this driver it will be handled by
        generic USB_HID driver and all incoming events will be multiplexed
        into a single mouse and a single keyboard device.
@@ -1140,7 +1141,7 @@ config HID_SENSOR_CUSTOM_SENSOR
          to decide how to interpret these special sensor ids and process in
          the user space. Currently some manufacturers are using these ids for
          sensor calibration and debugging other sensors. Manufacturers
-         should't use these special custom sensor ids to export any of the
+         shouldn't use these special custom sensor ids to export any of the
          standard sensors.
          Select this config option for custom/generic sensor support.