summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2019-01-10 21:19:33 +0100
committerShawn Guo <shawnguo@kernel.org>2019-03-22 09:55:59 +0800
commit728e096dd70889c2e80dd4153feee91afb1daf72 (patch)
tree011d4458fb05ffc1526d1126e5895eae3c6d3bde /arch/arm
parent15b43e497ffd80ca44c00d781869a0e71f223ea5 (diff)
downloadlinux-728e096dd70889c2e80dd4153feee91afb1daf72.tar.gz
linux-728e096dd70889c2e80dd4153feee91afb1daf72.tar.bz2
linux-728e096dd70889c2e80dd4153feee91afb1daf72.zip
ARM: imx_v6_v7_defconfig: continue compiling the pwm driver
After the pwm-imx driver was split into two drivers and the Kconfig symbol changed accordingly, use the new name to continue being able to use the PWM hardware. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm')
-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 5586a5074a96..50fb01d70b10 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -398,7 +398,7 @@ CONFIG_MAG3110=y
CONFIG_MPL3115=y
CONFIG_PWM=y
CONFIG_PWM_FSL_FTM=y
-CONFIG_PWM_IMX=y
+CONFIG_PWM_IMX27=y
CONFIG_NVMEM_IMX_OCOTP=y
CONFIG_NVMEM_VF610_OCOTP=y
CONFIG_TEE=y