summaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91/at91sam926x_time.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-24 12:31:34 +0400
committerIngo Molnar <mingo@elte.hu>2008-09-24 12:31:34 +0400
commite6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30 (patch)
tree77926550ac0c31b1423bcf193a4ed0ecb7fda2c1 /arch/arm/mach-at91/at91sam926x_time.c
parentd4738792fb86600b6cb7220459d9c47e819b3580 (diff)
parent72d31053f62c4bc464c2783974926969614a8649 (diff)
downloadlinux-e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30.tar.xz
Merge commit 'v2.6.27-rc7' into x86/microcode
Diffstat (limited to 'arch/arm/mach-at91/at91sam926x_time.c')
-rw-r--r--arch/arm/mach-at91/at91sam926x_time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c
index 5cecbd7de6a6..122fd77ed580 100644
--- a/arch/arm/mach-at91/at91sam926x_time.c
+++ b/arch/arm/mach-at91/at91sam926x_time.c
@@ -17,7 +17,7 @@
#include <asm/mach/time.h>
-#include <asm/arch/at91_pit.h>
+#include <mach/at91_pit.h>
#define PIT_CPIV(x) ((x) & AT91_PIT_CPIV)