diff --git a/[refs] b/[refs] index 156d0a3e3995..fc3fbdf1a402 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82d52a1948254aa3f35ca1a24c23284bd9f9a9c2 +refs/heads/master: 08268b78d6f0c659dc1d86453c57b336f6f4f9ae diff --git a/trunk/arch/arm/mach-mx25/Kconfig b/trunk/arch/arm/mach-mx25/Kconfig index cc28f56eae80..54d217314ee9 100644 --- a/trunk/arch/arm/mach-mx25/Kconfig +++ b/trunk/arch/arm/mach-mx25/Kconfig @@ -3,7 +3,6 @@ if ARCH_MX25 comment "MX25 platforms:" config MACH_MX25_3DS - select ARCH_MXC_IOMUX_V3 bool "Support MX25PDK (3DS) Platform" endif diff --git a/trunk/arch/arm/plat-mxc/Kconfig b/trunk/arch/arm/plat-mxc/Kconfig index cdee9176a775..44f3a805ae56 100644 --- a/trunk/arch/arm/plat-mxc/Kconfig +++ b/trunk/arch/arm/plat-mxc/Kconfig @@ -24,6 +24,7 @@ config ARCH_MX25 bool "MX25-based" select CPU_ARM926T select COMMON_CLKDEV + select ARCH_MXC_IOMUX_V3 select HAVE_FB_IMX help This enables support for systems based on the Freescale i.MX25 family