git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
arm
/
mach-ixp4xx
/
ixdpg425-pci.c
diff --git
a/arch/arm/mach-ixp4xx/ixdpg425-pci.c
b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
index
526fb61
..
ed52708
100644
(file)
--- a/
arch/arm/mach-ixp4xx/ixdpg425-pci.c
+++ b/
arch/arm/mach-ixp4xx/ixdpg425-pci.c
@@
-16,10
+16,10
@@
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/irq.h>
#include <asm/mach-types.h>
#include <asm/hardware.h>
-#include <asm/irq.h>
#include <asm/mach/pci.h>