diff --git a/[refs] b/[refs]
index bc624b5192d5..f6b0c3dd7688 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f1e2f98bd29f51edd64e0c15b10d9a18a7af4e1
+refs/heads/master: 508808cda6c39819f51b58e95ba5c6222acea222
diff --git a/trunk/arch/blackfin/kernel/setup.c b/trunk/arch/blackfin/kernel/setup.c
index c05e5e3bad68..4dffb913147e 100644
--- a/trunk/arch/blackfin/kernel/setup.c
+++ b/trunk/arch/blackfin/kernel/setup.c
@@ -951,6 +951,10 @@ static u_long get_clkin_hz(void)
 static int __init early_init_clkin_hz(char *buf)
 {
 	cached_clkin_hz = simple_strtoul(buf, NULL, 0);
+#ifdef BFIN_KERNEL_CLOCK
+	if (cached_clkin_hz != CONFIG_CLKIN_HZ)
+		panic("cannot change clkin_hz when reprogramming clocks");
+#endif
 	return 1;
 }
 early_param("clkin_hz=", early_init_clkin_hz);