diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-03 10:15:11 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-03 10:15:11 +0100 |
| commit | 1fef891761ddcbd7e57ec3961a0fb748003222ac (patch) | |
| tree | d192f1677521e17f1a943f8df570dd6449aa0da8 /arch/arm/mach-vexpress/headsmp.S | |
| parent | arm: mx50: add mx50 reference design board support (diff) | |
| parent | ARM: mxs: Add build configuration for mxs (diff) | |
| download | linux-1fef891761ddcbd7e57ec3961a0fb748003222ac.tar.xz linux-1fef891761ddcbd7e57ec3961a0fb748003222ac.zip | |
Merge branch 'sgu/mxs-core-v8' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38-new
Diffstat (limited to 'arch/arm/mach-vexpress/headsmp.S')
| -rw-r--r-- | arch/arm/mach-vexpress/headsmp.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/headsmp.S b/arch/arm/mach-vexpress/headsmp.S index 8a78ff68e1ee..7a3f0632947c 100644 --- a/arch/arm/mach-vexpress/headsmp.S +++ b/arch/arm/mach-vexpress/headsmp.S @@ -35,5 +35,6 @@ pen: ldr r7, [r6] */ b secondary_startup + .align 1: .long . .long pen_release |