diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 15:27:56 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 15:27:56 -0500 |
| commit | 038485ea9b66858c17f82e5393004532825106a7 (patch) | |
| tree | e411be1686e4ed73c4f74f0388410231d26e5c76 /arch/arm/mach-imx/Kconfig | |
| parent | 5d3cb0ffdd0c8987dc17a2ef4529b246198ceb72 (diff) | |
| parent | 8b69791215857e3e885d27b3945759ace820794a (diff) | |
Merge branch 'imx6/pm' into next/pm
* imx6/pm:
ARM: imx6q: resume PL310 only when CACHE_L2X0 defined
ARM: imx6q: build pm code only when CONFIG_PM selected
ARM: mx5: use generic irq chip pm interface for pm functions on
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index c44aa974e79c..0929768573ba 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
| @@ -595,6 +595,7 @@ comment "i.MX6 family:" | |||
| 595 | 595 | ||
| 596 | config SOC_IMX6Q | 596 | config SOC_IMX6Q |
| 597 | bool "i.MX6 Quad support" | 597 | bool "i.MX6 Quad support" |
| 598 | select ARM_CPU_SUSPEND if PM | ||
| 598 | select ARM_GIC | 599 | select ARM_GIC |
| 599 | select CACHE_L2X0 | 600 | select CACHE_L2X0 |
| 600 | select CPU_V7 | 601 | select CPU_V7 |