projects
/
cascardo
/
linux.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-rc6' into core/rcu
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap2
/
memory.c
diff --git
a/arch/arm/mach-omap2/memory.c
b/arch/arm/mach-omap2/memory.c
index
73cadb2
..
6b49cc9
100644
(file)
--- a/
arch/arm/mach-omap2/memory.c
+++ b/
arch/arm/mach-omap2/memory.c
@@
-24,9
+24,9
@@
#include <asm/io.h>
-#include <
asm/ar
ch/common.h>
-#include <
asm/ar
ch/clock.h>
-#include <
asm/ar
ch/sram.h>
+#include <
ma
ch/common.h>
+#include <
ma
ch/clock.h>
+#include <
ma
ch/sram.h>
#include "prm.h"