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-rc8' into x86/setup
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp23xx
/
pci.c
diff --git
a/arch/arm/mach-ixp23xx/pci.c
b/arch/arm/mach-ixp23xx/pci.c
index
227f808
..
701d60a
100644
(file)
--- a/
arch/arm/mach-ixp23xx/pci.c
+++ b/
arch/arm/mach-ixp23xx/pci.c
@@
-31,8
+31,7
@@
#include <asm/sizes.h>
#include <asm/system.h>
#include <asm/mach/pci.h>
-#include <asm/mach-types.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
extern int (*external_fault) (unsigned long, struct pt_regs *);