diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 07:30:20 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 07:42:17 -0500 |
commit | 237c78beb8a988453bac1993d21f025d070a0d8d (patch) | |
tree | 9864f0924650770881141359a2d5bac623949789 /arch/arm/mach-s3c64xx/clock.c | |
parent | 4eb821999086417ab42a15174b51497122fc406e (diff) | |
parent | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (diff) |
Merge branch 'depends/rmk/for-linus' into samsung/dt
Conflicts:
arch/arm/mach-exynos/Makefile
arch/arm/mach-exynos/cpu.c -> common.c
arch/arm/mach-exynos/include/mach/entry-macro.S
arch/arm/mach-exynos/init.c -> common.c
arch/arm/mach-s5p64x0/init.c -> common.c
arch/arm/mach-s5pv210/init.c -> common.c
Multiple files were moved into common.c files in the rmk/for-linus
branch, so this moves over the samsung/dt changes to the new
files.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s3c64xx/clock.c')
-rw-r--r-- | arch/arm/mach-s3c64xx/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c index 2addd988141c..a3aafb6768c9 100644 --- a/arch/arm/mach-s3c64xx/clock.c +++ b/arch/arm/mach-s3c64xx/clock.c | |||
@@ -716,7 +716,7 @@ static struct clk_lookup s3c64xx_clk_lookup[] = { | |||
716 | 716 | ||
717 | #define GET_DIV(clk, field) ((((clk) & field##_MASK) >> field##_SHIFT) + 1) | 717 | #define GET_DIV(clk, field) ((((clk) & field##_MASK) >> field##_SHIFT) + 1) |
718 | 718 | ||
719 | void __init_or_cpufreq s3c6400_setup_clocks(void) | 719 | void __init_or_cpufreq s3c64xx_setup_clocks(void) |
720 | { | 720 | { |
721 | struct clk *xtal_clk; | 721 | struct clk *xtal_clk; |
722 | unsigned long xtal; | 722 | unsigned long xtal; |
@@ -815,7 +815,7 @@ static struct clk *clks[] __initdata = { | |||
815 | * as ARMCLK as well as the necessary parent clocks. | 815 | * as ARMCLK as well as the necessary parent clocks. |
816 | * | 816 | * |
817 | * This call does not setup the clocks, which is left to the | 817 | * This call does not setup the clocks, which is left to the |
818 | * s3c6400_setup_clocks() call which may be needed by the cpufreq | 818 | * s3c64xx_setup_clocks() call which may be needed by the cpufreq |
819 | * or resume code to re-set the clocks if the bootloader has changed | 819 | * or resume code to re-set the clocks if the bootloader has changed |
820 | * them. | 820 | * them. |
821 | */ | 821 | */ |