diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-15 09:26:07 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-15 09:26:07 -0800 |
| commit | be26a3df0b80307bf8f73cea535c112210151bb9 (patch) | |
| tree | 8e3d90563b6d689ad37500929c05c211153295be /arch/arm/mach-s3c6400/include/mach/debug-macro.S | |
| parent | 918cae14872c56446415299fc17cf98704c9a537 (diff) | |
| parent | 61b603b4ee0c70708539e2fa5c3d47f17b7c7849 (diff) | |
| download | talos-op-linux-be26a3df0b80307bf8f73cea535c112210151bb9.tar.gz talos-op-linux-be26a3df0b80307bf8f73cea535c112210151bb9.zip | |
Merge branch 'debug-ll' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-s3c6400/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-s3c6400/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c6400/include/mach/debug-macro.S b/arch/arm/mach-s3c6400/include/mach/debug-macro.S index b18ac5266dfc..5c88875d6a3f 100644 --- a/arch/arm/mach-s3c6400/include/mach/debug-macro.S +++ b/arch/arm/mach-s3c6400/include/mach/debug-macro.S @@ -21,7 +21,7 @@ * aligned and add in the offset when we load the value here. */ - .macro addruart, rx + .macro addruart, rx, tmp mrc p15, 0, \rx, c1, c0 tst \rx, #1 ldreq \rx, = S3C_PA_UART |
