diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 13:27:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 13:27:47 +0200 |
| commit | c4c0c56a7a85ed5725786219e4fbca7e840b1531 (patch) | |
| tree | c9d6b35a571fd5e80ddf5bf4a60142480eaa18d8 /arch/arm/mach-iop32x/irq.c | |
| parent | rcu classic: new algorithm for callbacks-processing(v2) (diff) | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/c... (diff) | |
| download | linux-c4c0c56a7a85ed5725786219e4fbca7e840b1531.tar.xz linux-c4c0c56a7a85ed5725786219e4fbca7e840b1531.zip | |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'arch/arm/mach-iop32x/irq.c')
| -rw-r--r-- | arch/arm/mach-iop32x/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-iop32x/irq.c b/arch/arm/mach-iop32x/irq.c index 55cf0162e8c1..ba59b2d17db1 100644 --- a/arch/arm/mach-iop32x/irq.c +++ b/arch/arm/mach-iop32x/irq.c @@ -16,7 +16,7 @@ #include <linux/list.h> #include <asm/mach/irq.h> #include <asm/irq.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> static u32 iop32x_mask; |