summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2023-02-22 12:44:31 +0300
committerBenjamin Tissoires <benjamin.tissoires@redhat.com>2023-02-22 12:44:31 +0300
commit904e28c6de083fa4834cdbd0026470ddc30676fc (patch)
treef1b8a3dcdedcd9e7a4584808c8dcd96d7a091821 /net
parenta738688177dcdffe8064dc5ecac6ec4431b6b951 (diff)
parent2f7f4efb9411770b4ad99eb314d6418e980248b4 (diff)
downloadlinux-904e28c6de083fa4834cdbd0026470ddc30676fc.tar.xz
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: commit bf7660dab30d ("HID: stop drivers from selecting CONFIG_HID") conflicts with commit 2afac81dd165 ("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
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hidp/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hidp/Kconfig b/net/bluetooth/hidp/Kconfig
index 14100f341f33..6746be07e222 100644
--- a/net/bluetooth/hidp/Kconfig
+++ b/net/bluetooth/hidp/Kconfig
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
config BT_HIDP
tristate "HIDP protocol support"
- depends on BT_BREDR && INPUT
+ depends on BT_BREDR && INPUT && HID_SUPPORT
select HID
help
HIDP (Human Interface Device Protocol) is a transport layer