mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-05-02 18:17:50 -04:00
Merge branch 'for-6.3/hid-bpf' into for-linus
Initial support of HID-BPF (Benjamin Tissoires) The history is a little long for this series, as it was intended to be sent for v6.2. However some last minute issues forced us to postpone it to v6.3. Conflicts: * drivers/hid/i2c-hid/Kconfig: commitbf7660dab3("HID: stop drivers from selecting CONFIG_HID") conflicts with commit2afac81dd1("HID: fix I2C_HID not selected when I2C_HID_OF_ELAN is") the resolution is simple enough: just drop the "default" and "select" lines as the new commit from Arnd is doing
This commit is contained in:
@@ -2,13 +2,20 @@
|
||||
#
|
||||
# HID driver configuration
|
||||
#
|
||||
menu "HID support"
|
||||
depends on INPUT
|
||||
menuconfig HID_SUPPORT
|
||||
bool "HID bus support"
|
||||
default y
|
||||
depends on INPUT
|
||||
help
|
||||
This option adds core support for human interface device (HID).
|
||||
You will also need drivers from the following menu to make use of it.
|
||||
|
||||
if HID_SUPPORT
|
||||
|
||||
config HID
|
||||
tristate "HID bus support"
|
||||
depends on INPUT
|
||||
tristate "HID bus core support"
|
||||
default y
|
||||
depends on INPUT
|
||||
help
|
||||
A human interface device (HID) is a type of computer device that
|
||||
interacts directly with and takes input from humans. The term "HID"
|
||||
@@ -1295,6 +1302,8 @@ config HID_KUNIT_TEST
|
||||
|
||||
endmenu
|
||||
|
||||
source "drivers/hid/bpf/Kconfig"
|
||||
|
||||
endif # HID
|
||||
|
||||
source "drivers/hid/usbhid/Kconfig"
|
||||
@@ -1307,4 +1316,4 @@ source "drivers/hid/amd-sfh-hid/Kconfig"
|
||||
|
||||
source "drivers/hid/surface-hid/Kconfig"
|
||||
|
||||
endmenu
|
||||
endif # HID_SUPPORT
|
||||
|
||||
Reference in New Issue
Block a user