diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-10 00:05:00 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-10 00:05:15 +0400 |
| commit | 5497e7b8967118ee45f8ef2d301fce919a35d660 (patch) | |
| tree | ef4633712579d9a06fce69c0748580fe05ca19ab /arch/arm/mach-imx | |
| parent | 8cbc95ee748741939222c3d38584a40c92bedcdd (diff) | |
| parent | eb16d33273532533400cb95189aa50d6b734db57 (diff) | |
| download | linux-5497e7b8967118ee45f8ef2d301fce919a35d660.tar.xz | |
Merge branch 'late/fixes' into fixes
* late/fixes:
ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP
ARM: ux500: always select ABX500_CORE
ARM: SIRF: select SMP_ON_UP only on SMP builds
ARM: SPEAr: conditionalize l2x0 support
ARM: imx: build CPU suspend code only when needed
ARM: OMAP: build SMP code only for OMAP4/5
ARM: tegra: Tegra114 needs CPU_FREQ_TABLE
ARM: default machine descriptor for multiplatform
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/headsmp.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/headsmp.S b/arch/arm/mach-imx/headsmp.S index a58c8b0527cc..67b9c48dcafe 100644 --- a/arch/arm/mach-imx/headsmp.S +++ b/arch/arm/mach-imx/headsmp.S @@ -24,7 +24,7 @@ ENTRY(v7_secondary_startup) ENDPROC(v7_secondary_startup) #endif -#ifdef CONFIG_PM +#ifdef CONFIG_ARM_CPU_SUSPEND /* * The following code must assume it is running from physical address * where absolute virtual addresses to the data section have to be |