Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / include / linux / errno.h

diff --git a/include/linux/errno.h b/include/linux/errno.h
index e0de516374da37de6a95c35e79ab7cabb899d177..f6bf082d4d4f3afdf4fedcd606c1d15d7120b84c 100644 (file)
--- a/include/linux/errno.h
+++ b/include/linux/errno.h
@@ -1,9 +1,8 @@
 #ifndef _LINUX_ERRNO_H
 #define _LINUX_ERRNO_H
 
-#include <asm/errno.h>
+#include <uapi/linux/errno.h>
 
-#ifdef __KERNEL__
 
 /*
  * These should never be seen by user programs.  To return one of ERESTART*
@@ -32,5 +31,3 @@
 #define EIOCBRETRY     530     /* iocb queued, will trigger a retry */
 
 #endif
-
-#endif