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 'x86/fpu' into x86/urgent
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
sram242x.S
diff --git
a/arch/arm/mach-omap2/sram242x.S
b/arch/arm/mach-omap2/sram242x.S
index
4c27451
..
af4bd34
100644
(file)
--- a/
arch/arm/mach-omap2/sram242x.S
+++ b/
arch/arm/mach-omap2/sram242x.S
@@
-24,8
+24,8
@@
*/
#include <linux/linkage.h>
#include <asm/assembler.h>
-#include <
asm/ar
ch/io.h>
-#include <
asm
/hardware.h>
+#include <
ma
ch/io.h>
+#include <
mach
/hardware.h>
#include "prm.h"
#include "cm.h"