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-h720x/cpu-h7202.c | |
| parent | 5127bed588a2f8f3a1f732de2a8a190b7df5dce3 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'arch/arm/mach-h720x/cpu-h7202.c')
| -rw-r--r-- | arch/arm/mach-h720x/cpu-h7202.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c index c627fa124eb3..53e1f62f2e79 100644 --- a/arch/arm/mach-h720x/cpu-h7202.c +++ b/arch/arm/mach-h720x/cpu-h7202.c @@ -17,9 +17,9 @@ #include <linux/interrupt.h> #include <linux/module.h> #include <asm/types.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> -#include <asm/arch/irqs.h> +#include <mach/irqs.h> #include <asm/mach/irq.h> #include <asm/mach/time.h> #include <linux/device.h> |