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 'fix/pcm-hwptr' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp4xx
/
avila-setup.c
diff --git
a/arch/arm/mach-ixp4xx/avila-setup.c
b/arch/arm/mach-ixp4xx/avila-setup.c
index
87e38ca
..
797995c
100644
(file)
--- a/
arch/arm/mach-ixp4xx/avila-setup.c
+++ b/
arch/arm/mach-ixp4xx/avila-setup.c
@@
-23,7
+23,7
@@
#include <asm/types.h>
#include <asm/setup.h>
#include <asm/memory.h>
-#include <
asm/ar
ch/hardware.h>
+#include <
ma
ch/hardware.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
#include <asm/mach/arch.h>