diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-25 03:19:59 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-25 03:19:59 -0400 |
| commit | bdf4e9482360a3ddc1619efbd5d1c928ede8c3fa (patch) | |
| tree | b02319e809c5b8abfca85409a11472775e27f597 /arch/arm/kernel/debug.S | |
| parent | 06afb1a087d49ae0f676b2e5b9ffe5f4b3aba355 (diff) | |
| parent | eb0474544bc16a9dab53b26abd846e86ba814eb1 (diff) | |
Merge branch 'misc' into for-linus
Conflicts:
arch/arm/mach-integrator/integrator_ap.c
Diffstat (limited to 'arch/arm/kernel/debug.S')
| -rw-r--r-- | arch/arm/kernel/debug.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index bcd66e00bdbe..0f852d082fcf 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S | |||
| @@ -151,6 +151,8 @@ printhex: adr r2, hexbuf | |||
| 151 | b printascii | 151 | b printascii |
| 152 | ENDPROC(printhex2) | 152 | ENDPROC(printhex2) |
| 153 | 153 | ||
| 154 | hexbuf: .space 16 | ||
| 155 | |||
| 154 | .ltorg | 156 | .ltorg |
| 155 | 157 | ||
| 156 | ENTRY(printascii) | 158 | ENTRY(printascii) |
| @@ -175,5 +177,3 @@ ENTRY(printch) | |||
| 175 | mov r0, #0 | 177 | mov r0, #0 |
| 176 | b 1b | 178 | b 1b |
| 177 | ENDPROC(printch) | 179 | ENDPROC(printch) |
| 178 | |||
| 179 | hexbuf: .space 16 | ||