git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/misc' into topic/misc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
omap-headsmp.S
diff --git
a/arch/arm/mach-omap2/omap-headsmp.S
b/arch/arm/mach-omap2/omap-headsmp.S
index 6ae937a06cc1883f83af604845bf51c859f2adeb..4ee6aeca885a830d31714a2e897ebb4b0ff63660 100644
(file)
--- a/
arch/arm/mach-omap2/omap-headsmp.S
+++ b/
arch/arm/mach-omap2/omap-headsmp.S
@@
-45,5
+45,5
@@
hold: ldr r12,=0x103
* should now contain the SVC stack for this core
*/
b secondary_startup
-END(omap_secondary_startup)
+END
PROC
(omap_secondary_startup)