projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/vt-d' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu...
[cascardo/linux.git]
/
arch
/
arm
/
mach-mvebu
/
cpu-reset.c
diff --git
a/arch/arm/mach-mvebu/cpu-reset.c
b/arch/arm/mach-mvebu/cpu-reset.c
index
60fb537
..
4a2cadd
100644
(file)
--- a/
arch/arm/mach-mvebu/cpu-reset.c
+++ b/
arch/arm/mach-mvebu/cpu-reset.c
@@
-15,7
+15,6
@@
#include <linux/of_address.h>
#include <linux/io.h>
#include <linux/resource.h>
-#include "armada-370-xp.h"
static void __iomem *cpu_reset_base;
static size_t cpu_reset_size;