Commit 1f41a6a9 authored by Henrik Rydberg's avatar Henrik Rydberg Committed by Jiri Kosina

HID: Fix the generic Kconfig options

The generic HID driver is obviously not a special driver, so move it
outside of the special drivers menu. Explain the usage and make the
default follow the HID setting. This should simplify migration from
older kernels. While at it, remove the redundant HID_SUPPORT option
and modify the HID and USB_HID entries to better explain the bus
structure.
Reported-by: default avatarJan Beulich <jbeulich@suse.com>
Signed-off-by: default avatarHenrik Rydberg <rydberg@euromail.se>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent e75561b3
# #
# HID driver configuration # HID driver configuration
# #
menuconfig HID_SUPPORT menu "HID support"
bool "HID Devices" depends on INPUT
depends on INPUT
default y
---help---
Say Y here to get to see options for various computer-human interface
device drivers. This option alone does not add any kernel code.
If you say N, all options in this submenu will be skipped and disabled.
if HID_SUPPORT
config HID config HID
tristate "Generic HID support" tristate "HID bus support"
depends on INPUT depends on INPUT
default y default y
---help--- ---help---
...@@ -23,14 +14,17 @@ config HID ...@@ -23,14 +14,17 @@ config HID
most commonly used to refer to the USB-HID specification, but other most commonly used to refer to the USB-HID specification, but other
devices (such as, but not strictly limited to, Bluetooth) are devices (such as, but not strictly limited to, Bluetooth) are
designed using HID specification (this involves certain keyboards, designed using HID specification (this involves certain keyboards,
mice, tablets, etc). This option compiles into kernel the generic mice, tablets, etc). This option adds the HID bus to the kernel,
HID layer code (parser, usages, etc.), which can then be used by together with generic HID layer code. The HID devices are added and
transport-specific HID implementation (like USB or Bluetooth). removed from the HID bus by the transport-layer drivers, such as
usbhid (USB_HID) and hidp (BT_HIDP).
For docs and specs, see http://www.usb.org/developers/hidpage/ For docs and specs, see http://www.usb.org/developers/hidpage/
If unsure, say Y. If unsure, say Y.
if HID
config HID_BATTERY_STRENGTH config HID_BATTERY_STRENGTH
bool "Battery level reporting for HID devices" bool "Battery level reporting for HID devices"
depends on HID && POWER_SUPPLY && HID = POWER_SUPPLY depends on HID && POWER_SUPPLY && HID = POWER_SUPPLY
...@@ -59,23 +53,22 @@ config HIDRAW ...@@ -59,23 +53,22 @@ config HIDRAW
If unsure, say Y. If unsure, say Y.
source "drivers/hid/usbhid/Kconfig"
menu "Special HID drivers"
depends on HID
config HID_GENERIC config HID_GENERIC
tristate "Generic HID driver" tristate "Generic HID driver"
depends on HID depends on HID
default y default HID
---help--- ---help---
Support for generic HID devices. Support for generic devices on the HID bus. This includes most
keyboards and mice, joysticks, tablets and digitizers.
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called hid-generic. will be called hid-generic.
If unsure, say Y. If unsure, say Y.
menu "Special HID drivers"
depends on HID
config HID_A4TECH config HID_A4TECH
tristate "A4 tech mice" if EXPERT tristate "A4 tech mice" if EXPERT
depends on USB_HID depends on USB_HID
...@@ -662,4 +655,8 @@ config HID_ZYDACRON ...@@ -662,4 +655,8 @@ config HID_ZYDACRON
endmenu endmenu
endif # HID_SUPPORT endif # HID
source "drivers/hid/usbhid/Kconfig"
endmenu
comment "USB Input Devices" menu "USB HID support"
depends on USB depends on USB
config USB_HID config USB_HID
tristate "USB Human Interface Device (full HID) support" tristate "USB HID transport layer"
default y default y
depends on USB && INPUT depends on USB && INPUT
select HID select HID
---help--- ---help---
Say Y here if you want full HID support to connect USB keyboards, Say Y here if you want to connect USB keyboards,
mice, joysticks, graphic tablets, or any other HID based devices mice, joysticks, graphic tablets, or any other HID based devices
to your computer via USB, as well as Uninterruptible Power Supply to your computer via USB, as well as Uninterruptible Power Supply
(UPS) and monitor control devices. (UPS) and monitor control devices.
...@@ -81,4 +81,4 @@ config USB_MOUSE ...@@ -81,4 +81,4 @@ config USB_MOUSE
endmenu endmenu
endmenu
config BT_HIDP config BT_HIDP
tristate "HIDP protocol support" tristate "HIDP protocol support"
depends on BT && INPUT && HID_SUPPORT depends on BT && INPUT
select HID select HID
help help
HIDP (Human Interface Device Protocol) is a transport layer HIDP (Human Interface Device Protocol) is a transport layer
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment