diff options
author | H. Peter Anvin <hpa@zytor.com> | 2008-04-06 10:35:00 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-05-02 16:18:20 -0700 |
commit | 3726c23df8e4d95b6f2b335dfa90e3f4850a8a00 (patch) | |
tree | c90d40b9224b90bc00ca23fc8f9b4d00739b6f06 | |
parent | d13ff31cfeedbf2fefc7ba13cb753775648eac0c (diff) | |
download | linux-stable-3726c23df8e4d95b6f2b335dfa90e3f4850a8a00.tar.gz linux-stable-3726c23df8e4d95b6f2b335dfa90e3f4850a8a00.tar.bz2 linux-stable-3726c23df8e4d95b6f2b335dfa90e3f4850a8a00.zip |
alpha: types: use <asm-generic/int-*.h> for the alpha architecture
This modifies <asm-alpha/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
-rw-r--r-- | include/asm-alpha/types.h | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/include/asm-alpha/types.h b/include/asm-alpha/types.h index f5716139ec89..a9e34ca4d463 100644 --- a/include/asm-alpha/types.h +++ b/include/asm-alpha/types.h @@ -8,28 +8,12 @@ * not a major issue. However, for interoperability, libraries still * need to be careful to avoid a name clashes. */ +#include <asm-generic/int-l64.h> #ifndef __ASSEMBLY__ typedef unsigned int 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; - -typedef __signed__ long __s64; -typedef unsigned long __u64; - #endif /* __ASSEMBLY__ */ /* @@ -39,23 +23,5 @@ typedef unsigned long __u64; #define BITS_PER_LONG 64 -#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 s64; -typedef unsigned long u64; - -typedef u64 dma_addr_t; -typedef u64 dma64_addr_t; - -#endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */ #endif /* _ALPHA_TYPES_H */ |