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-mv78xx0
/
common.c
diff --git
a/arch/arm/mach-mv78xx0/common.c
b/arch/arm/mach-mv78xx0/common.c
index
d27b83b
..
e633f9c
100644
(file)
--- a/
arch/arm/mach-mv78xx0/common.c
+++ b/
arch/arm/mach-mv78xx0/common.c
@@
-17,7
+17,7
@@
#include <linux/ata_platform.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
#include <linux/ata_platform.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
-#include <
asm/ar
ch/mv78xx0.h>
+#include <
ma
ch/mv78xx0.h>
#include <asm/plat-orion/cache-feroceon-l2.h>
#include <asm/plat-orion/ehci-orion.h>
#include <asm/plat-orion/orion_nand.h>
#include <asm/plat-orion/cache-feroceon-l2.h>
#include <asm/plat-orion/ehci-orion.h>
#include <asm/plat-orion/orion_nand.h>