summaryrefslogtreecommitdiff
path: root/arch/cris/include/uapi/asm/posix_types.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-02-05 16:02:29 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-02-05 16:02:29 +1100
commit616dc90f49ee9a44f26d0817f0f82d1847e89cc2 (patch)
treee45d7782d9a1cee56400119adadd0ac53d9a88a5 /arch/cris/include/uapi/asm/posix_types.h
parent71c3295aef0e12d5ecd6138463f464a3a90de276 (diff)
parent457583af4aef89d5252769ea290a2acc89e2361f (diff)
Merge branch 'akpm/master'
Diffstat (limited to 'arch/cris/include/uapi/asm/posix_types.h')
-rw-r--r--arch/cris/include/uapi/asm/posix_types.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/cris/include/uapi/asm/posix_types.h b/arch/cris/include/uapi/asm/posix_types.h
index ce4e51793151..0f22e6a67ea5 100644
--- a/arch/cris/include/uapi/asm/posix_types.h
+++ b/arch/cris/include/uapi/asm/posix_types.h
@@ -22,11 +22,6 @@ typedef unsigned short __kernel_uid_t;
typedef unsigned short __kernel_gid_t;
#define __kernel_uid_t __kernel_uid_t
-typedef __SIZE_TYPE__ __kernel_size_t;
-typedef long __kernel_ssize_t;
-typedef int __kernel_ptrdiff_t;
-#define __kernel_size_t __kernel_size_t
-
typedef unsigned short __kernel_old_dev_t;
#define __kernel_old_dev_t __kernel_old_dev_t