diff --git a/[refs] b/[refs]
index b2ea0a59f5e5..257d38aa86b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8792dbff6ed93c5a77f71917d4a0c5efa12eee1
+refs/heads/master: f3b464cca94c4a8f54fbc11ec5af8b143fd1750b
diff --git a/trunk/arch/arm/plat-samsung/clock-clksrc.c b/trunk/arch/arm/plat-samsung/clock-clksrc.c
index 98c6b8859f49..656c70e0400a 100644
--- a/trunk/arch/arm/plat-samsung/clock-clksrc.c
+++ b/trunk/arch/arm/plat-samsung/clock-clksrc.c
@@ -177,9 +177,11 @@ 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++) {
+		if (!clksrc->reg_div.reg && !clksrc->reg_src.reg)
+			printk(KERN_ERR "%s: clock %s has no registers set\n",
+			       __func__, clksrc->clk.name);
+
 		/* fill in the default functions */
 
 		if (!clksrc->clk.ops) {