summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-03-07 03:34:41 -0800
committerKukjin Kim <kgene.kim@samsung.com>2012-03-07 03:34:41 -0800
commit60571f98d292b74586ff8330d8bc965eb01e8df0 (patch)
tree8d4f14f4a99b8b465828a314620f3b3aa030713f /arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h
parenta5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff)
parent6d259a25b56d15ea3cb4b7f2195a188326812d88 (diff)
Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static
Conflicts: arch/arm/mach-exynos/dma.c arch/arm/mach-s5p64x0/dma.c arch/arm/mach-s5pc100/dma.c arch/arm/mach-s5pv210/dma.c
Diffstat (limited to 'arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h')
-rw-r--r--arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h b/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h
index ff85b4b6e8d..0ef47d1b767 100644
--- a/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h
+++ b/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h
@@ -22,16 +22,9 @@ extern struct clksrc_clk clk_mout_epll;
extern int s5p64x0_epll_enable(struct clk *clk, int enable);
extern unsigned long s5p64x0_epll_get_rate(struct clk *clk);
-extern unsigned long s5p64x0_armclk_get_rate(struct clk *clk);
-extern unsigned long s5p64x0_armclk_round_rate(struct clk *clk, unsigned long rate);
-extern int s5p64x0_armclk_set_rate(struct clk *clk, unsigned long rate);
-
-extern struct clk_ops s5p64x0_clkarm_ops;
-
extern struct clksrc_clk clk_armclk;
extern struct clksrc_clk clk_dout_mpll;
-extern struct clk *clkset_hclk_low_list[];
extern struct clksrc_sources clkset_hclk_low;
extern int s5p64x0_pclk_ctrl(struct clk *clk, int enable);