diff options
author | H. Peter Anvin <hpa@zytor.com> | 2008-04-06 10:35:09 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-05-02 16:18:32 -0700 |
commit | 849bf3a09fdcf9dbbe060da0f5bce90231b14625 (patch) | |
tree | 843324d19e5c78eb0bde2b51354548a25b322c49 | |
parent | 8523437b4c664cfc0f11998c4274846b95182000 (diff) |
parisc: types: use <asm-generic/int-*.h> for the parisc architecture
This modifies <asm-parisc/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Kyle McMartin <kyle@parisc-linux.org>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Grant Grundler <grundler@parisc-linux.org>
-rw-r--r-- | include/asm-parisc/types.h | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/include/asm-parisc/types.h b/include/asm-parisc/types.h index 56c84802da5..7f5a39bfb4c 100644 --- a/include/asm-parisc/types.h +++ b/include/asm-parisc/types.h @@ -1,29 +1,12 @@ #ifndef _PARISC_TYPES_H #define _PARISC_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__ */ /* @@ -41,18 +24,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; |