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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[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
4c29a89
..
0eef78b
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)
- .macro addruart, rx
+ .macro addruart, rx
, tmp
mrc p15, 0, \rx, c1, c0
tst \rx, #1
ldreq \rx, = S3C24XX_PA_UART