diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 15:41:02 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 15:41:02 -0500 |
| commit | 67635d397a643514fdfa859f611b86bd3ad8958d (patch) | |
| tree | b5df6d79b35cde39c00f0cc1432f128f473d4d6e /arch/arm/plat-versatile/headsmp.S | |
| parent | 192fef18d0f5ac9a05a93ff6314fc9865c10fbf9 (diff) | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
Merge 3.8-rc5 into usb-next
This fixes up a conflict with drivers/usb/serial/io_ti.c that came up in
linux-next.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/plat-versatile/headsmp.S')
| -rw-r--r-- | arch/arm/plat-versatile/headsmp.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-versatile/headsmp.S b/arch/arm/plat-versatile/headsmp.S index dd703ef09b8d..b178d44e9eaa 100644 --- a/arch/arm/plat-versatile/headsmp.S +++ b/arch/arm/plat-versatile/headsmp.S | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | ENTRY(versatile_secondary_startup) | 21 | ENTRY(versatile_secondary_startup) |
| 22 | mrc p15, 0, r0, c0, c0, 5 | 22 | mrc p15, 0, r0, c0, c0, 5 |
| 23 | and r0, r0, #15 | 23 | bic r0, #0xff000000 |
| 24 | adr r4, 1f | 24 | adr r4, 1f |
| 25 | ldmia r4, {r5, r6} | 25 | ldmia r4, {r5, r6} |
| 26 | sub r4, r4, r5 | 26 | sub r4, r4, r5 |