diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-26 17:04:15 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:17 -0500 |
| commit | 0583fcc96bb117763c0fa74c123573c0112dec65 (patch) | |
| tree | 5d8a62e922c34e6e6bc0836b40f5b59f69266766 /include | |
| parent | 1bc94226d5c642b78cf6b2e3e843ef24eb740df0 (diff) | |
consolidate umode_t declarations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/types.h | 6 | ||||
| -rw-r--r-- | include/linux/types.h | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/asm-generic/types.h b/include/asm-generic/types.h index 7a0f69e6c618..bd39806013b5 100644 --- a/include/asm-generic/types.h +++ b/include/asm-generic/types.h @@ -6,10 +6,4 @@ */ #include <asm-generic/int-ll64.h> -#ifndef __ASSEMBLY__ - -typedef unsigned short umode_t; - -#endif /* __ASSEMBLY__ */ - #endif /* _ASM_GENERIC_TYPES_H */ diff --git a/include/linux/types.h b/include/linux/types.h index 57a97234bec1..f0ac9bda0f78 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -24,6 +24,7 @@ typedef __kernel_fd_set fd_set; typedef __kernel_dev_t dev_t; typedef __kernel_ino_t ino_t; typedef __kernel_mode_t mode_t; +typedef unsigned short umode_t; typedef __kernel_nlink_t nlink_t; typedef __kernel_off_t off_t; typedef __kernel_pid_t pid_t; |