diff options
author | H. Peter Anvin <hpa@zytor.com> | 2008-04-06 10:35:11 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-05-02 16:18:40 -0700 |
commit | ba6677886e46adcd075f251d8971debf7b5ca3ee (patch) | |
tree | d507f79db9c0dbcd873b0f15f68e21df2167d6d8 | |
parent | 59df83992b6ec962fdf69e4db4c18951499cc67c (diff) | |
download | linux-stable-ba6677886e46adcd075f251d8971debf7b5ca3ee.tar.gz linux-stable-ba6677886e46adcd075f251d8971debf7b5ca3ee.tar.bz2 linux-stable-ba6677886e46adcd075f251d8971debf7b5ca3ee.zip |
sh: types: use <asm-generic/int-*.h> for the sh architecture
This modifies <asm-sh/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | include/asm-sh/types.h | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/include/asm-sh/types.h b/include/asm-sh/types.h index a6e1d4126e67..beea4e6f8dfd 100644 --- a/include/asm-sh/types.h +++ b/include/asm-sh/types.h @@ -1,29 +1,12 @@ #ifndef __ASM_SH_TYPES_H #define __ASM_SH_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__ */ /* @@ -35,19 +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; |