git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-s3c2410/include/mach/debug-macro.S
b/arch/arm/mach-s3c2410/include/mach/debug-macro.S
index
5882dea
..
4135de8
100644
(file)
--- a/
arch/arm/mach-s3c2410/include/mach/debug-macro.S
+++ b/
arch/arm/mach-s3c2410/include/mach/debug-macro.S
@@
-19,7
+19,7
@@
#define S3C2410_UART1_OFF (0x4000)
#define SHIFT_2440TXF (14-9)
#define S3C2410_UART1_OFF (0x4000)
#define SHIFT_2440TXF (14-9)
- .macro addruart, rp, rv
+ .macro addruart, rp, rv
, tmp
ldr \rp, = S3C24XX_PA_UART
ldr \rv, = S3C24XX_VA_UART
#if CONFIG_DEBUG_S3C_UART != 0
ldr \rp, = S3C24XX_PA_UART
ldr \rv, = S3C24XX_VA_UART
#if CONFIG_DEBUG_S3C_UART != 0