diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /arch/arm/plat-s3c24xx/time.c | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'arch/arm/plat-s3c24xx/time.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c index 64bfa19ae951..c51916236ac0 100644 --- a/arch/arm/plat-s3c24xx/time.c +++ b/arch/arm/plat-s3c24xx/time.c | |||
| @@ -33,12 +33,12 @@ | |||
| 33 | 33 | ||
| 34 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
| 35 | #include <mach/map.h> | 35 | #include <mach/map.h> |
| 36 | #include <asm/plat-s3c/regs-timer.h> | 36 | #include <plat/regs-timer.h> |
| 37 | #include <mach/regs-irq.h> | 37 | #include <mach/regs-irq.h> |
| 38 | #include <asm/mach/time.h> | 38 | #include <asm/mach/time.h> |
| 39 | 39 | ||
| 40 | #include <asm/plat-s3c24xx/clock.h> | 40 | #include <plat/clock.h> |
| 41 | #include <asm/plat-s3c24xx/cpu.h> | 41 | #include <plat/cpu.h> |
| 42 | 42 | ||
| 43 | static unsigned long timer_startval; | 43 | static unsigned long timer_startval; |
| 44 | static unsigned long timer_usec_ticks; | 44 | static unsigned long timer_usec_ticks; |