1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index a2f48487e90b..c26a619fe77e 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,11 +1,14 @@
 config ARCH_MXC
         bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
+        select ARCH_HAS_CPUFREQ
+        select ARCH_HAS_OPP
         select ARCH_REQUIRE_GPIOLIB
         select ARM_CPU_SUSPEND if PM
         select CLKSRC_MMIO
         select GENERIC_ALLOCATOR
         select GENERIC_IRQ_CHIP
         select PINCTRL
+        select PM_OPP if PM
         select SOC_BUS
         help
           Support for Freescale MXC/iMX-based family of processors
@@ -777,8 +780,6 @@ config	SOC_IMX53
 
 config SOC_IMX6Q
         bool "i.MX6 Quad/DualLite support"
-        select ARCH_HAS_CPUFREQ
-        select ARCH_HAS_OPP
         select ARM_ERRATA_754322
         select ARM_ERRATA_764369 if SMP
         select ARM_ERRATA_775420
@@ -796,7 +797,6 @@ config SOC_IMX6Q
         select PL310_ERRATA_588369 if CACHE_PL310
         select PL310_ERRATA_727915 if CACHE_PL310
         select PL310_ERRATA_769419 if CACHE_PL310
-        select PM_OPP if PM
 
         help
           This enables support for Freescale i.MX6 Quad processor.