diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 19:58:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 19:58:42 -0400 |
| commit | a41842f70d6d6b0cfde3d21e163add81c4318ebd (patch) | |
| tree | 238fc75a5d10adc70ef7a4c812ac5cbd366fb9b5 /arch/arm/mach-s5p6442/include/mach/debug-macro.S | |
| parent | 722874465e3cd3268387b96e02220f84b35a8d98 (diff) | |
| parent | 0e17226f7cd289504724466f4298abc9bdfca3fe (diff) | |
Merge branch 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux
* 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux:
ARM: SAMSUNG: Fixup commit 4e6d488af37980d224cbf298224db6173673f362
ARM: SAMSUNG: Fix build error from stale define in <plat/uncompress.h>
ARM: SAMSUNG: Add suspend/resume support for S3C PWM driver
ARM: S3C2440: Fix s3c2440 cpufreq compilation post move.
Diffstat (limited to 'arch/arm/mach-s5p6442/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-s5p6442/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p6442/include/mach/debug-macro.S b/arch/arm/mach-s5p6442/include/mach/debug-macro.S index 1aae691e58ef..bb6536147ffb 100644 --- a/arch/arm/mach-s5p6442/include/mach/debug-macro.S +++ b/arch/arm/mach-s5p6442/include/mach/debug-macro.S | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <mach/map.h> | 15 | #include <mach/map.h> |
| 16 | #include <plat/regs-serial.h> | 16 | #include <plat/regs-serial.h> |
| 17 | 17 | ||
| 18 | .macro addruart, rx | 18 | .macro addruart, rx, rtmp |
| 19 | mrc p15, 0, \rx, c1, c0 | 19 | mrc p15, 0, \rx, c1, c0 |
| 20 | tst \rx, #1 | 20 | tst \rx, #1 |
| 21 | ldreq \rx, = S3C_PA_UART | 21 | ldreq \rx, = S3C_PA_UART |