diff --git a/[refs] b/[refs]
index 6303e8d24add..aa4d9e57d2d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45dabf1427a0a876f733b07239ade1bdb0e06010
+refs/heads/master: 82706b8f7bd1365e50478d3d0f6090f22e4571c7
diff --git a/trunk/include/asm-sh/unistd.h b/trunk/include/asm-sh/unistd.h
index 4b21f369c28c..65be656ead7d 100644
--- a/trunk/include/asm-sh/unistd.h
+++ b/trunk/include/asm-sh/unistd.h
@@ -1,5 +1,13 @@
-#ifdef CONFIG_SUPERH32
-# include "unistd_32.h"
+#ifdef __KERNEL__
+# ifdef CONFIG_SUPERH32
+#  include "unistd_32.h"
+# else
+#  include "unistd_64.h"
+# endif
 #else
-# include "unistd_64.h"
+# ifdef __SH5__
+#  include "unistd_64.h"
+# else
+#  include "unistd_32.h"
+# endif
 #endif