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 branch 'fixes' into arm/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ixp4xx
/
nslu2-pci.c
diff --git
a/arch/arm/mach-ixp4xx/nslu2-pci.c
b/arch/arm/mach-ixp4xx/nslu2-pci.c
index 032defe111aa99d1b274649b3d4cb8d10573fe49..d69ee4066d20cf83f737979a0871a6663cba93e5 100644
(file)
--- a/
arch/arm/mach-ixp4xx/nslu2-pci.c
+++ b/
arch/arm/mach-ixp4xx/nslu2-pci.c
@@
-21,6
+21,8
@@
#include <asm/mach/pci.h>
#include <asm/mach-types.h>
+#include "irqs.h"
+
#define MAX_DEV 3
#define IRQ_LINES 3