From 8fe9e39fd1421e5e1c2d4ee8e35bf7d340def879 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Wed, 7 Mar 2012 02:00:04 -0800 Subject: [PATCH] --- yaml --- r: 295699 b: refs/heads/master c: 7d9811f11f823f28d8d04fbb6aafebb909a4cd15 h: refs/heads/master i: 295697: 48dfcafe99a9858d29ea05436583cd012920f090 295695: a64a91eef4e16eb3104553c0980cf4b14815f6c8 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c24xx/clock-s3c2443.c | 7 ------- trunk/arch/arm/plat-samsung/include/plat/clock.h | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index b27f88dc109c..22793195be83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 714cc3a574282732dbd0c4389e4f82d750d7e5f9 +refs/heads/master: 7d9811f11f823f28d8d04fbb6aafebb909a4cd15 diff --git a/trunk/arch/arm/mach-s3c24xx/clock-s3c2443.c b/trunk/arch/arm/mach-s3c24xx/clock-s3c2443.c index 6dde2696f8f0..efb3ac359566 100644 --- a/trunk/arch/arm/mach-s3c24xx/clock-s3c2443.c +++ b/trunk/arch/arm/mach-s3c24xx/clock-s3c2443.c @@ -179,11 +179,6 @@ static struct clk *clks[] __initdata = { &clk_hsmmc, }; -void __init_or_cpufreq s3c2443_setup_clocks(void) -{ - s3c2443_common_setup_clocks(s3c2443_get_mpll); -} - void __init s3c2443_init_clocks(int xtal) { unsigned long epllcon = __raw_readl(S3C2443_EPLLCON); @@ -196,8 +191,6 @@ void __init s3c2443_init_clocks(int xtal) armdiv, ARRAY_SIZE(armdiv), S3C2443_CLKDIV0_ARMDIV_MASK); - s3c2443_setup_clocks(); - s3c24xx_register_clocks(clks, ARRAY_SIZE(clks)); for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++) diff --git a/trunk/arch/arm/plat-samsung/include/plat/clock.h b/trunk/arch/arm/plat-samsung/include/plat/clock.h index 3b5a9dcc29c5..a62753dc15ba 100644 --- a/trunk/arch/arm/plat-samsung/include/plat/clock.h +++ b/trunk/arch/arm/plat-samsung/include/plat/clock.h @@ -118,7 +118,6 @@ extern void s3c24xx_setup_clocks(unsigned long fclk, extern void s3c2410_setup_clocks(void); extern void s3c2412_setup_clocks(void); extern void s3c244x_setup_clocks(void); -extern void s3c2443_setup_clocks(void); /* S3C2410 specific clock functions */