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 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-mvebu
/
armada-370-xp.c
diff --git
a/arch/arm/mach-mvebu/armada-370-xp.c
b/arch/arm/mach-mvebu/armada-370-xp.c
index
dfe635b
..
49d7915
100644
(file)
--- a/
arch/arm/mach-mvebu/armada-370-xp.c
+++ b/
arch/arm/mach-mvebu/armada-370-xp.c
@@
-20,7
+20,7
@@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
-#include
<mach/armada-370-xp.h>
+#include
"armada-370-xp.h"
#include "common.h"
static struct map_desc armada_370_xp_io_desc[] __initdata = {