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-lh7a40x/irq-lpd7a40x.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-lh7a40x/irq-lpd7a40x.c')
| -rw-r--r-- | arch/arm/mach-lh7a40x/irq-lpd7a40x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-lh7a40x/irq-lpd7a40x.c b/arch/arm/mach-lh7a40x/irq-lpd7a40x.c index 66e1ed3961ea..0d5063ebda10 100644 --- a/arch/arm/mach-lh7a40x/irq-lpd7a40x.c +++ b/arch/arm/mach-lh7a40x/irq-lpd7a40x.c @@ -13,10 +13,10 @@ #include <linux/module.h> #include <linux/interrupt.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <asm/mach/irq.h> -#include <asm/arch/irqs.h> +#include <mach/irqs.h> #include "common.h" |