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 tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c
/
dev-uart-s3c64xx.c
diff --git
a/arch/arm/mach-s3c64xx/dev-uart.c
b/arch/arm/mach-s3c/dev-uart-s3c64xx.c
similarity index 95%
rename from
arch/arm/mach-s3c64xx/dev-uart.c
rename to
arch/arm/mach-s3c/dev-uart-s3c64xx.c
index 5fb59ad30008996015522a0b3e5f588c606e58b1..8288e8d6c092918f50b5d28449710b15340d86ca 100644
(file)
--- a/
arch/arm/mach-s3c64xx/dev-uart.c
+++ b/
arch/arm/mach-s3c/dev-uart-s3c64xx.c
@@
-15,11
+15,10
@@
#include <asm/mach/arch.h>
#include <asm/mach/irq.h>
-#include <mach/hardware.h>
-#include <mach/map.h>
+#include "map.h"
#include <mach/irqs.h>
-#include
<plat/devs.h>
+#include
"devs.h"
/* Serial port registrations */