diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 16:58:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 16:58:42 -0700 |
| commit | a41842f70d6d6b0cfde3d21e163add81c4318ebd (patch) | |
| tree | 238fc75a5d10adc70ef7a4c812ac5cbd366fb9b5 /arch/arm/mach-s5p6440/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-s5p6440/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-s5p6440/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p6440/include/mach/debug-macro.S b/arch/arm/mach-s5p6440/include/mach/debug-macro.S index 48cdb0da026..1347d7f9907 100644 --- a/arch/arm/mach-s5p6440/include/mach/debug-macro.S +++ b/arch/arm/mach-s5p6440/include/mach/debug-macro.S @@ -19,7 +19,7 @@ * aligned and add in the offset when we load the value here. */ - .macro addruart, rx + .macro addruart, rx, rtmp mrc p15, 0, \rx, c1, c0 tst \rx, #1 ldreq \rx, = S3C_PA_UART |