diff options
| author | Linaro CI <ci_notify@linaro.org> | 2022-04-19 09:16:36 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2022-04-19 09:16:36 +0000 |
| commit | eb481826d414c821d157cfbe2c23455e4f6f0af7 (patch) | |
| tree | 0134107d33f0a251d67044be78c34a1451cb8658 | |
| parent | f1621baa902acda43a80810478acf0997a61fee9 (diff) | |
| parent | f940c67643e0c0330c18e308a10372db17140a3c (diff) | |
Merge remote-tracking branch 'gsi/tracking-qcomlt-gsi' into integration-linux-qcomlt
# Conflicts:
# drivers/i2c/busses/i2c-qcom-geni.c
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 58fb96d4c19e..53ff2956ec6f 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -998,6 +998,7 @@ CONFIG_TEGRA186_GPC_DMA=m CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA210_ADMA=m CONFIG_QCOM_BAM_DMA=y +CONFIG_QCOM_GPI_DMA=m CONFIG_QCOM_HIDMA_MGMT=y CONFIG_QCOM_HIDMA=y CONFIG_RCAR_DMAC=y |