diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-15 12:26:07 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-15 12:26:07 -0500 |
| commit | be26a3df0b80307bf8f73cea535c112210151bb9 (patch) | |
| tree | 8e3d90563b6d689ad37500929c05c211153295be /arch/arm/plat-stmp3xxx/include/mach/debug-macro.S | |
| parent | 918cae14872c56446415299fc17cf98704c9a537 (diff) | |
| parent | 61b603b4ee0c70708539e2fa5c3d47f17b7c7849 (diff) | |
Merge branch 'debug-ll' into omap-for-linus
Diffstat (limited to 'arch/arm/plat-stmp3xxx/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/plat-stmp3xxx/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-stmp3xxx/include/mach/debug-macro.S b/arch/arm/plat-stmp3xxx/include/mach/debug-macro.S index fb3b969bf0a2..1b9348bf0e49 100644 --- a/arch/arm/plat-stmp3xxx/include/mach/debug-macro.S +++ b/arch/arm/plat-stmp3xxx/include/mach/debug-macro.S | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | * http://www.gnu.org/copyleft/gpl.html | 16 | * http://www.gnu.org/copyleft/gpl.html |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | .macro addruart,rx | 19 | .macro addruart, rx, tmp |
| 20 | mrc p15, 0, \rx, c1, c0 | 20 | mrc p15, 0, \rx, c1, c0 |
| 21 | tst \rx, #1 @ MMU enabled? | 21 | tst \rx, #1 @ MMU enabled? |
| 22 | moveq \rx, #0x80000000 @ physical base address | 22 | moveq \rx, #0x80000000 @ physical base address |