diff --git a/[refs] b/[refs]
index e8c0e49ff561..16253e9e6abd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c2f69b15d5420291a941ace10149e76f0af7ab0
+refs/heads/master: fb6e76cd2309c76d2120e013ff34ff6ab27aad88
diff --git a/trunk/arch/arm/plat-samsung/clock-clksrc.c b/trunk/arch/arm/plat-samsung/clock-clksrc.c
index 12129f8e509c..aaf7d5ebea96 100644
--- a/trunk/arch/arm/plat-samsung/clock-clksrc.c
+++ b/trunk/arch/arm/plat-samsung/clock-clksrc.c
@@ -158,14 +158,25 @@ static struct clk_ops clksrc_ops = {
 	.round_rate	= s3c_roundrate_clksrc,
 };
 
+static struct clk_ops clksrc_ops_nodiv = {
+	.set_parent	= s3c_setparent_clksrc,
+};
+
 void __init s3c_register_clksrc(struct clksrc_clk *clksrc, int size)
 {
 	int ret;
 
+	WARN_ON(!clksrc->reg_div.reg && !clksrc->reg_src.reg);
+
 	for (; size > 0; size--, clksrc++) {
 		/* fill in the default functions */
-		if (!clksrc->clk.ops)
-			clksrc->clk.ops = &clksrc_ops;
+
+		if (!clksrc->clk.ops) {
+			if (!clksrc->reg_div.reg)
+				clksrc->clk.ops = &clksrc_ops_nodiv;
+			else
+				clksrc->clk.ops = &clksrc_ops;
+		}
 
 		/* setup the clocksource, but do not announce it
 		 * as it may be re-set by the setup routines