git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
mach-otom.c
diff --git
a/arch/arm/mach-s3c2410/mach-otom.c
b/arch/arm/mach-s3c2410/mach-otom.c
index 1f899fa588dfdcaef21d531f3360447366f334b6..717af40e4477d62fcae8a1da4178f159517b57a4 100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-otom.c
+++ b/
arch/arm/mach-s3c2410/mach-otom.c
@@
-29,7
+29,7
@@
#include <asm/irq.h>
#include <asm/mach-types.h>
-#include <asm/
arch
/regs-serial.h>
+#include <asm/
plat-s3c
/regs-serial.h>
#include <asm/arch/regs-gpio.h>
#include <asm/plat-s3c24xx/s3c2410.h>