diff --git a/[refs] b/[refs]
index cf4643c9d743..3699977ece81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34e44fe87437b6a5aad856f15f7a849e5fc137aa
+refs/heads/master: 7e87aed965fa7a642fc299af96d370dad7b5b814
diff --git a/trunk/include/linux/clk.h b/trunk/include/linux/clk.h
index b0252726df61..c9547d99e52c 100644
--- a/trunk/include/linux/clk.h
+++ b/trunk/include/linux/clk.h
@@ -81,7 +81,7 @@ int clk_notifier_register(struct clk *clk, struct notifier_block *nb);
 
 int clk_notifier_unregister(struct clk *clk, struct notifier_block *nb);
 
-#endif /* !CONFIG_COMMON_CLK */
+#endif
 
 /**
  * clk_get - lookup and obtain a reference to a clock producer.