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 commit 'v2.6.27-rc3' into x86/xsave
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp23xx
/
roadrunner.c
diff --git
a/arch/arm/mach-ixp23xx/roadrunner.c
b/arch/arm/mach-ixp23xx/roadrunner.c
index
896ff9f
..
6d38d76
100644
(file)
--- a/
arch/arm/mach-ixp23xx/roadrunner.c
+++ b/
arch/arm/mach-ixp23xx/roadrunner.c
@@
-33,7
+33,7
@@
#include <asm/types.h>
#include <asm/setup.h>
#include <asm/memory.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
#include <asm/system.h>