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-orion5x
/
mss2-setup.c
diff --git
a/arch/arm/mach-orion5x/mss2-setup.c
b/arch/arm/mach-orion5x/mss2-setup.c
index
7ce9e40
..
4403cc9
100644
(file)
--- a/
arch/arm/mach-orion5x/mss2-setup.c
+++ b/
arch/arm/mach-orion5x/mss2-setup.c
@@
-25,7
+25,7
@@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
-#include <
asm/ar
ch/orion5x.h>
+#include <
ma
ch/orion5x.h>
#include "common.h"
#include "mpp.h"
#include "common.h"
#include "mpp.h"