diff options
author | H. Peter Anvin <hpa@zytor.com> | 2008-04-06 10:35:05 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-05-02 16:18:21 -0700 |
commit | ff704db3d4d9354712df2683b62f89dc0611632a (patch) | |
tree | f52fb5e2b9cc99f232164261832737d4fc65e5d4 /include/asm-m32r | |
parent | 4a4bb4cee14905dd8b2b471b6998d62eeae8199c (diff) | |
download | linux-3.10-ff704db3d4d9354712df2683b62f89dc0611632a.tar.gz linux-3.10-ff704db3d4d9354712df2683b62f89dc0611632a.tar.bz2 linux-3.10-ff704db3d4d9354712df2683b62f89dc0611632a.zip |
m32r: types: use <asm-generic/int-*.h> for the m32r architecture
This modifies <asm-m32r/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Diffstat (limited to 'include/asm-m32r')
-rw-r--r-- | include/asm-m32r/types.h | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/include/asm-m32r/types.h b/include/asm-m32r/types.h index b64c16639a7..bc9f7fff0ac 100644 --- a/include/asm-m32r/types.h +++ b/include/asm-m32r/types.h @@ -1,28 +1,12 @@ #ifndef _ASM_M32R_TYPES_H #define _ASM_M32R_TYPES_H +#include <asm-generic/int-ll64.h> + #ifndef __ASSEMBLY__ typedef unsigned short umode_t; -/* - * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the - * header files exported to user space - */ - -typedef __signed__ char __s8; -typedef unsigned char __u8; - -typedef __signed__ short __s16; -typedef unsigned short __u16; - -typedef __signed__ int __s32; -typedef unsigned int __u32; - -#if defined(__GNUC__) -__extension__ typedef __signed__ long long __s64; -__extension__ typedef unsigned long long __u64; -#endif #endif /* __ASSEMBLY__ */ /* @@ -34,18 +18,6 @@ __extension__ typedef unsigned long long __u64; #ifndef __ASSEMBLY__ -typedef signed char s8; -typedef unsigned char u8; - -typedef signed short s16; -typedef unsigned short u16; - -typedef signed int s32; -typedef unsigned int u32; - -typedef signed long long s64; -typedef unsigned long long u64; - /* DMA addresses are 32-bits wide. */ typedef u32 dma_addr_t; |