diff --git a/[refs] b/[refs]
index 43b5e0c51e2f..d7905b787353 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c42954dfd50d02963cd453fb84bfef3967af2f0
+refs/heads/master: 686f8c5d77149f78ff6090dde774b2e43a7319b2
diff --git a/trunk/include/linux/clk.h b/trunk/include/linux/clk.h
index 12848f81bb37..5ca8c6fddb56 100644
--- a/trunk/include/linux/clk.h
+++ b/trunk/include/linux/clk.h
@@ -8,8 +8,8 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#ifndef ASMARM_CLOCK_H
-#define ASMARM_CLOCK_H
+#ifndef __LINUX_CLK_H
+#define __LINUX_CLK_H
 
 struct device;