diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-04-06 10:35:06 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-05-02 16:18:28 -0700 |
| commit | ad55ed6161c113cc03c04df266e75d484bce8247 (patch) | |
| tree | bcd32d9878f5f8f6b8ee4ce398ec4b541f4fc6f1 | |
| parent | ff704db3d4d9354712df2683b62f89dc0611632a (diff) | |
| download | linux-3.10-ad55ed6161c113cc03c04df266e75d484bce8247.tar.gz linux-3.10-ad55ed6161c113cc03c04df266e75d484bce8247.tar.bz2 linux-3.10-ad55ed6161c113cc03c04df266e75d484bce8247.zip | |
m68k: types: use <asm-generic/int-*.h> for the m68k architecture
This modifies <asm-m68k/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
| -rw-r--r-- | include/asm-m68k/types.h | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/include/asm-m68k/types.h b/include/asm-m68k/types.h index c35c09d93b6..6441cb5f8e7 100644 --- a/include/asm-m68k/types.h +++ b/include/asm-m68k/types.h @@ -8,30 +8,12 @@ * not a major issue. However, for interoperability, libraries still * need to be careful to avoid a name clashes. */ +#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__ */ /* @@ -43,18 +25,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 always 32-bits wide */ typedef u32 dma_addr_t; |