git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ixp4xx
/
common-pci.c
diff --git
a/arch/arm/mach-ixp4xx/common-pci.c
b/arch/arm/mach-ixp4xx/common-pci.c
index 6835b17113e57f3e5c936c2150c6d33ce385fcd6..a53104bb28f54d7517121e06cb1649039656e60c 100644
(file)
--- a/
arch/arm/mach-ixp4xx/common-pci.c
+++ b/
arch/arm/mach-ixp4xx/common-pci.c
@@
-31,7
+31,7
@@
#include <asm/cputype.h>
#include <asm/irq.h>
-#include <
asm
/sizes.h>
+#include <
linux
/sizes.h>
#include <asm/mach/pci.h>
#include <mach/hardware.h>