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/mach-s3c2443/clock.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/mach-s3c2443/clock.c')
| -rw-r--r-- | arch/arm/mach-s3c2443/clock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c index 603b5ea1deab..2f60bf6b8d43 100644 --- a/arch/arm/mach-s3c2443/clock.c +++ b/arch/arm/mach-s3c2443/clock.c | |||
| @@ -39,9 +39,9 @@ | |||
| 39 | 39 | ||
| 40 | #include <mach/regs-s3c2443-clock.h> | 40 | #include <mach/regs-s3c2443-clock.h> |
| 41 | 41 | ||
| 42 | #include <asm/plat-s3c24xx/s3c2443.h> | 42 | #include <plat/s3c2443.h> |
| 43 | #include <asm/plat-s3c24xx/clock.h> | 43 | #include <plat/clock.h> |
| 44 | #include <asm/plat-s3c24xx/cpu.h> | 44 | #include <plat/cpu.h> |
| 45 | 45 | ||
| 46 | /* We currently have to assume that the system is running | 46 | /* We currently have to assume that the system is running |
| 47 | * from the XTPll input, and that all ***REFCLKs are being | 47 | * from the XTPll input, and that all ***REFCLKs are being |