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 kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
arm
/
mach-ixp4xx
/
nas100d-pci.c
diff --git
a/arch/arm/mach-ixp4xx/nas100d-pci.c
b/arch/arm/mach-ixp4xx/nas100d-pci.c
index
26b7c00
..
b8ebaf4
100644
(file)
--- a/
arch/arm/mach-ixp4xx/nas100d-pci.c
+++ b/
arch/arm/mach-ixp4xx/nas100d-pci.c
@@
-15,9
+15,9
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/irq.h>
#include <asm/mach/pci.h>
#include <asm/mach-types.h>
#include <asm/mach/pci.h>
#include <asm/mach-types.h>