diff options
| author |  Benjamin Tissoires <benjamin.tissoires@redhat.com>
| 2023-02-22 10:44:31 +0100 |
|---|---|---|
| committer | Benjamin Tissoires <benjamin.tissoires@redhat.com>
| 2023-02-22 10:44:31 +0100 |
| commit | 904e28c6de083fa4834cdbd0026470ddc30676fc (patch) | |
| tree | f1b8a3dcdedcd9e7a4584808c8dcd96d7a091821 /drivers/hid/intel-ish-hid | |
| parent | Merge branch 'for-6.3/uclogic' into for-linus (diff) | |
| parent | Documentation: hid: correct spelling (diff) | |
| download | linux-904e28c6de083fa4834cdbd0026470ddc30676fc.tar.gz linux-904e28c6de083fa4834cdbd0026470ddc30676fc.tar.bz2 linux-904e28c6de083fa4834cdbd0026470ddc30676fc.zip | |
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 'drivers/hid/intel-ish-hid')
| -rw-r--r-- | drivers/hid/intel-ish-hid/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/intel-ish-hid/Kconfig b/drivers/hid/intel-ish-hid/Kconfig index 689da84a520d..253dc10d35ef 100644 --- a/drivers/hid/intel-ish-hid/Kconfig +++ b/drivers/hid/intel-ish-hid/Kconfig @@ -6,7 +6,7 @@ config INTEL_ISH_HID tristate "Intel Integrated Sensor Hub" default n depends on X86 - select HID + depends on HID help The Integrated Sensor Hub (ISH) enables the ability to offload sensor polling and algorithm processing to a dedicated low power |