diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 10:38:13 +0000 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 10:38:13 +0000 |
| commit | 851462444d421c223965b12b836bef63da61b57f (patch) | |
| tree | 495baa14e638817941496c36e1443aed7dae0ea0 /include/linux/errno.h | |
| parent | 5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc (diff) | |
| parent | 6924d99fcdf1a688538a3cdebd1f135c22eec191 (diff) | |
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
Conflicts:
drivers/mtd/nand/nand_base.c
Diffstat (limited to 'include/linux/errno.h')
| -rw-r--r-- | include/linux/errno.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/errno.h b/include/linux/errno.h index e0de516374da..f6bf082d4d4f 100644 --- 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 |