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 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
arch
/
arm
/
mach-mv78xx0
/
mpp.c
diff --git
a/arch/arm/mach-mv78xx0/mpp.c
b/arch/arm/mach-mv78xx0/mpp.c
index
df50342
..
72843c0
100644
(file)
--- a/
arch/arm/mach-mv78xx0/mpp.c
+++ b/
arch/arm/mach-mv78xx0/mpp.c
@@
-12,7
+12,7
@@
#include <linux/init.h>
#include <linux/io.h>
#include <plat/mpp.h>
-#include
<mach/hardware.h>
+#include
"mv78xx0.h"
#include "common.h"
#include "mpp.h"