summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/include/plat/clock.h
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-19 18:04:11 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-19 18:04:11 +0900
commit32457942b90aabb9242b450f02d18d9c8d982916 (patch)
tree6472b77016f83f2ada7a7e2ca83a9803f313f1a8 /arch/arm/plat-samsung/include/plat/clock.h
parent6071399674e813d797d9f458ec8913b86c85398e (diff)
parentf64bea4318a73e833d0a9b8400cc0f6cee957da3 (diff)
downloadblackbird-op-linux-32457942b90aabb9242b450f02d18d9c8d982916.tar.gz
blackbird-op-linux-32457942b90aabb9242b450f02d18d9c8d982916.zip
ARM: Merge for-2635/fb-updates1
Merge branch 'for-2635/fb-updates1' into for-linus/samsung2
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/clock.h')
-rw-r--r--arch/arm/plat-samsung/include/plat/clock.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h
index efbc984640c3..0fbcd0effd8e 100644
--- a/arch/arm/plat-samsung/include/plat/clock.h
+++ b/arch/arm/plat-samsung/include/plat/clock.h
@@ -92,6 +92,7 @@ extern int s3c24xx_register_clock(struct clk *clk);
extern int s3c24xx_register_clocks(struct clk **clk, int nr_clks);
extern void s3c_register_clocks(struct clk *clk, int nr_clks);
+extern void s3c_disable_clocks(struct clk *clkp, int nr_clks);
extern int s3c24xx_register_baseclocks(unsigned long xtal);
OpenPOWER on IntegriCloud