projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/urgent' into x86/mm, to pick up dependent fix
[cascardo/linux.git]
/
arch
/
arm
/
mach-iop13xx
/
pci.c
diff --git
a/arch/arm/mach-iop13xx/pci.c
b/arch/arm/mach-iop13xx/pci.c
index
9082b84
..
204eb44
100644
(file)
--- a/
arch/arm/mach-iop13xx/pci.c
+++ b/
arch/arm/mach-iop13xx/pci.c
@@
-27,7
+27,7
@@
#include <asm/sizes.h>
#include <asm/signal.h>
#include <asm/mach/pci.h>
-#include
<mach/pci.h>
+#include
"pci.h"
#define IOP13XX_PCI_DEBUG 0
#define PRINTK(x...) ((void)(IOP13XX_PCI_DEBUG && printk(x)))