From: H. Peter Anvin Date: Sun, 6 Apr 2008 17:35:11 +0000 (-0700) Subject: sh: types: use for the sh architecture X-Git-Tag: v2.6.26-rc1~2^2~7 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ba6677886e46adcd075f251d8971debf7b5ca3ee;p=linux-2.6-omap-h63xx.git sh: types: use for the sh architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Paul Mundt --- diff --git a/include/asm-sh/types.h b/include/asm-sh/types.h index a6e1d4126e6..beea4e6f8df 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 + #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;