diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:42:45 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:42:45 -0400 |
| commit | 8083e1656211eb1487329923d592ee061d08d7b3 (patch) | |
| tree | 92a44787484996b82365fab21f2dec960ab4f2d3 /arch/arm/mach-ixp4xx | |
| parent | 6b12a3d35ff6cb09f8b777ab258ea1e32c680d62 (diff) | |
| parent | 1802ca745280b916cda4090e459741b8c9b3e8d0 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'arch/arm/mach-ixp4xx')
| -rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-pci.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-power.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/nslu2-pci.c b/arch/arm/mach-ixp4xx/nslu2-pci.c index 0de639d6e60..04661fef97f 100644 --- a/arch/arm/mach-ixp4xx/nslu2-pci.c +++ b/arch/arm/mach-ixp4xx/nslu2-pci.c @@ -17,6 +17,7 @@ #include <linux/pci.h> #include <linux/init.h> +#include <linux/irq.h> #include <asm/mach/pci.h> #include <asm/mach-types.h> diff --git a/arch/arm/mach-ixp4xx/nslu2-power.c b/arch/arm/mach-ixp4xx/nslu2-power.c index e2a2230b69f..a29b3b2b61b 100644 --- a/arch/arm/mach-ixp4xx/nslu2-power.c +++ b/arch/arm/mach-ixp4xx/nslu2-power.c @@ -19,6 +19,7 @@ #include <linux/module.h> #include <linux/reboot.h> +#include <linux/irq.h> #include <linux/interrupt.h> #include <linux/reboot.h> |