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 'linux-next' of git://git.infradead.org/ubifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-u300
/
u300.c
diff --git
a/arch/arm/mach-u300/u300.c
b/arch/arm/mach-u300/u300.c
index
07c35a8
..
48b3b7f
100644
(file)
--- a/
arch/arm/mach-u300/u300.c
+++ b/
arch/arm/mach-u300/u300.c
@@
-19,9
+19,9
@@
#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/platform.h>
-#include <mach/memory.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include <asm/memory.h>
static void __init u300_reserve(void)
{