diff options
| author | Arnd Bergmann | 2018-03-27 15:22:43 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2018-03-27 15:22:43 +0200 |
| commit | 8d361e40180c534da2d788a1334e18c80021a8d5 (patch) | |
| tree | 36e51ae39b35061821d85a11a1bfecf8ffa53f86 /arch | |
| parent | 8045f297548f1e1a52f1045a52661856477d0a15 (diff) | |
| parent | 266c157de3b21b6da3e015085dda48cfa9f0f76d (diff) | |
Merge tag 'amlogic-defconfig' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/soc
Pull "Amlogic defconfig fixes for v4.17" from Kevin Hilman
* tag 'amlogic-defconfig' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
arm64: defconfig: enable MESON EFUSE
Diffstat (limited to 'arch')
| -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 d1fc10bdc045..3fdaf10eaa2b 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -577,6 +577,7 @@ CONFIG_PHY_XGENE=y CONFIG_PHY_TEGRA_XUSB=y CONFIG_QCOM_L2_PMU=y CONFIG_QCOM_L3_PMU=y +CONFIG_MESON_EFUSE=m CONFIG_UNIPHIER_EFUSE=y CONFIG_TEE=y CONFIG_OPTEE=y |