diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-17 08:59:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-17 08:59:10 +0200 |
| commit | cc4949e1fdade5d063e9f8783cf0e2cc92041ce5 (patch) | |
| tree | 4023bd641bfe464efbde518fb504d6865c9df014 /arch/arm/mach-s3c6410/cpu.c | |
| parent | x86, boot: use .code16gcc instead of .code16 (diff) | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-cc4949e1fdade5d063e9f8783cf0e2cc92041ce5.tar.xz linux-cc4949e1fdade5d063e9f8783cf0e2cc92041ce5.zip | |
Merge branch 'linus' into x86/urgent
Merge reason: pull in latest to fix a bug in it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-s3c6410/cpu.c')
| -rw-r--r-- | arch/arm/mach-s3c6410/cpu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c6410/cpu.c b/arch/arm/mach-s3c6410/cpu.c index 6a73ca6b7a3a..ade904de8895 100644 --- a/arch/arm/mach-s3c6410/cpu.c +++ b/arch/arm/mach-s3c6410/cpu.c @@ -31,6 +31,7 @@ #include <plat/cpu-freq.h> #include <plat/regs-serial.h> +#include <plat/regs-clock.h> #include <plat/cpu.h> #include <plat/devs.h> @@ -68,7 +69,7 @@ void __init s3c6410_init_clocks(int xtal) printk(KERN_DEBUG "%s: initialising clocks\n", __func__); s3c24xx_register_baseclocks(xtal); s3c64xx_register_clocks(); - s3c6400_register_clocks(); + s3c6400_register_clocks(S3C6410_CLKDIV0_ARM_MASK); s3c6400_setup_clocks(); } |