diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 23:24:51 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 23:24:51 +0200 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /arch/arm/plat-s3c24xx/time.c | |
| parent | Merge branch 'omap-all' into devel (diff) | |
| parent | [ARM] S3C24XX: Additional include moves (diff) | |
| download | linux-7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4.tar.xz linux-7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4.zip | |
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 @@ #include <asm/irq.h> #include <mach/map.h> -#include <asm/plat-s3c/regs-timer.h> +#include <plat/regs-timer.h> #include <mach/regs-irq.h> #include <asm/mach/time.h> -#include <asm/plat-s3c24xx/clock.h> -#include <asm/plat-s3c24xx/cpu.h> +#include <plat/clock.h> +#include <plat/cpu.h> static unsigned long timer_startval; static unsigned long timer_usec_ticks; |