diff --git a/[refs] b/[refs]
index 45ad1332d995..a47f3d9f6186 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7afb48eb5147be9eb9789b4161462d246451ac2
+refs/heads/master: 34c278d3913a15b64943e8c40a16b4f732cc7c59
diff --git a/trunk/include/linux/unistd.h b/trunk/include/linux/unistd.h
index 10ed9834b822..c18c60f3254e 100644
--- a/trunk/include/linux/unistd.h
+++ b/trunk/include/linux/unistd.h
@@ -1,7 +1,9 @@
 #ifndef _LINUX_UNISTD_H_
 #define _LINUX_UNISTD_H_
 
+#ifdef __KERNEL__
 extern int errno;
+#endif
 
 /*
  * Include machine specific syscallX macros