diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2021-02-23 11:33:54 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2021-02-23 11:33:54 +0100 |
| commit | 27b730e088ff41e43f543a3f8e2042b9ee8ce2f1 (patch) | |
| tree | 94f8058da298043f5c3fe00e9a5d9a90c79db50b /arch | |
| parent | d6310078d9f8c416e85f641a631aecf58f9c97ff (diff) | |
| parent | c1ed18c11bdb80eced208a61d40b1988f36a014f (diff) | |
| download | linux-27b730e088ff41e43f543a3f8e2042b9ee8ce2f1.tar.bz2 | |
Merge branch 'for-5.12/i2c-hid' into for-linus
- ACPI and OF support made more generic / decoupled. From Douglas Anderson
- support for Goodix devices from Douglas Anderson
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/configs/defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 838301650a79..326198305beb 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -749,7 +749,8 @@ CONFIG_SND_SOC_WM8904=m CONFIG_SND_SOC_WSA881X=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_AUDIO_GRAPH_CARD=m -CONFIG_I2C_HID=m +CONFIG_I2C_HID_ACPI=m +CONFIG_I2C_HID_OF=m CONFIG_USB_CONN_GPIO=m CONFIG_USB=y CONFIG_USB_OTG=y |