summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/imx_v6_v7_defconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2023-02-10 18:10:22 +0100
committerArnd Bergmann <arnd@arndb.de>2023-02-10 18:15:52 +0100
commit9330e13e6b802b936e673f9feb139ae51f056f7e (patch)
treee141da8fcb2d6e839f8856335207ba9767df9a9f /arch/arm/configs/imx_v6_v7_defconfig
parentarm64: reorder defconfig (diff)
downloadlinux-9330e13e6b802b936e673f9feb139ae51f056f7e.tar.xz
linux-9330e13e6b802b936e673f9feb139ae51f056f7e.zip
ARM: reorder defconfig files
Some Kconfig options have moved around, so adapt the defconfig files accordingly. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/imx_v6_v7_defconfig')
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 3540fb241dd5..6dc6fed12af8 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -416,8 +416,8 @@ CONFIG_PWM_FSL_FTM=y
CONFIG_PWM_IMX27=y
CONFIG_PWM_IMX_TPM=y
CONFIG_NVMEM_IMX_OCOTP=y
-CONFIG_NVMEM_VF610_OCOTP=y
CONFIG_NVMEM_SNVS_LPGPR=y
+CONFIG_NVMEM_VF610_OCOTP=y
CONFIG_TEE=y
CONFIG_OPTEE=y
CONFIG_MUX_MMIO=y