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 commit 'v2.6.27-rc8' into x86/setup
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx2
/
generic.c
diff --git
a/arch/arm/mach-mx2/generic.c
b/arch/arm/mach-mx2/generic.c
index
07875cf
..
dea6521
100644
(file)
--- a/
arch/arm/mach-mx2/generic.c
+++ b/
arch/arm/mach-mx2/generic.c
@@
-20,7
+20,7
@@
#include <linux/mm.h>
#include <linux/init.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/pgtable.h>
#include <asm/mach/map.h>