diff --git a/[refs] b/[refs]
index 3f53bb10db74..984d4a30cab8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b2d38b48b5abb6921ac6ad2d080ce82887cdbc7
+refs/heads/master: 4fd5a433d4887f0a6c766c258ca335100ffe208a
diff --git a/trunk/include/asm-v850/clinkage.h b/trunk/include/asm-v850/clinkage.h
index 2b622adccae5..c389691d6f86 100644
--- a/trunk/include/asm-v850/clinkage.h
+++ b/trunk/include/asm-v850/clinkage.h
@@ -11,7 +11,7 @@
  * Written by Miles Bader <miles@gnu.org>
  */
 
-#ifndef __CLINKAGE_H__
+#ifndef __V850_CLINKAGE_H__
 #define __V850_CLINKAGE_H__
 
 #include <asm/macrology.h>