projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[cascardo/linux.git]
/
arch
/
arm
/
mach-shmobile
/
smp-r8a7791.c
diff --git
a/arch/arm/mach-shmobile/smp-r8a7791.c
b/arch/arm/mach-shmobile/smp-r8a7791.c
index
ec97952
..
2648d68
100644
(file)
--- a/
arch/arm/mach-shmobile/smp-r8a7791.c
+++ b/
arch/arm/mach-shmobile/smp-r8a7791.c
@@
-18,9
+18,9
@@
#include <linux/smp.h>
#include <linux/io.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
#include <mach/r8a7791.h>
-#include <mach/rcar-gen2.h>
+#include "common.h"
+#include "rcar-gen2.h"
#define RST 0xe6160000
#define CA15BAR 0x0020