diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-13 13:08:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-13 13:08:47 +0200 |
| commit | a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f (patch) | |
| tree | 957c915298b299902aa80afa7c78e94c71b3dc25 /arch/arm/mach-at91/at91x40_time.c | |
| parent | 7b27718bdb1b70166383dec91391df5534d449ee (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
| download | op-kernel-dev-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.zip op-kernel-dev-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.tar.gz | |
Merge commit 'v2.6.27-rc3' into x86/urgent
Diffstat (limited to 'arch/arm/mach-at91/at91x40_time.c')
| -rw-r--r-- | arch/arm/mach-at91/at91x40_time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91x40_time.c b/arch/arm/mach-at91/at91x40_time.c index eddc882..869b5e2 100644 --- a/arch/arm/mach-at91/at91x40_time.c +++ b/arch/arm/mach-at91/at91x40_time.c @@ -23,10 +23,10 @@ #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/time.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/mach/time.h> -#include <asm/arch/at91_tc.h> +#include <mach/at91_tc.h> /* * 3 counter/timer units present. |
