diff options
| author | Stephen Rothwell <sfr@elm.ozlabs.ibm.com> | 2008-09-12 05:44:18 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@elm.ozlabs.ibm.com> | 2008-09-12 05:44:18 +1000 |
| commit | ead1241e61abb84adcd13d0828e6c91c33ed0d66 (patch) | |
| tree | 054f01fd9a2c880b3899c36e4eef7ea4dea8b484 /arch/arm/mach-footbridge/isa-irq.c | |
| parent | 69169505f0c8226f728e67faf4566114994aea6d (diff) | |
| parent | b584cb9ef50a0138b3c15b2aa6a5d8b21258ccd2 (diff) | |
Merge commit 'arm/devel'
Diffstat (limited to 'arch/arm/mach-footbridge/isa-irq.c')
| -rw-r--r-- | arch/arm/mach-footbridge/isa-irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c index 7132e522c366..62bb38f1369d 100644 --- a/arch/arm/mach-footbridge/isa-irq.c +++ b/arch/arm/mach-footbridge/isa-irq.c @@ -18,13 +18,13 @@ #include <linux/interrupt.h> #include <linux/list.h> #include <linux/init.h> +#include <linux/io.h> #include <asm/mach/irq.h> #include <mach/hardware.h> #include <asm/hardware/dec21285.h> #include <asm/irq.h> -#include <asm/io.h> #include <asm/mach-types.h> static void isa_mask_pic_lo_irq(unsigned int irq) |