diff options
author | H. Peter Anvin <hpa@zytor.com> | 2008-04-06 10:35:02 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-05-02 16:18:20 -0700 |
commit | e3b8cf047eb2702178b8cc16f03f8194af840732 (patch) | |
tree | 91e3e9ffd2f02bd88820100cf013e4ae881b1df1 /include/asm-cris | |
parent | 5424a328d281f54bbc62bf9b5118c45f8113a8b8 (diff) | |
download | blackbird-op-linux-e3b8cf047eb2702178b8cc16f03f8194af840732.tar.gz blackbird-op-linux-e3b8cf047eb2702178b8cc16f03f8194af840732.zip |
cris: types: use <asm-generic/int-*.h> for the cris architecture
This modifies <asm-cris/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'include/asm-cris')
-rw-r--r-- | include/asm-cris/types.h | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/include/asm-cris/types.h b/include/asm-cris/types.h index 5a21c42bc6c5..5790262cbe8a 100644 --- a/include/asm-cris/types.h +++ b/include/asm-cris/types.h @@ -1,29 +1,12 @@ #ifndef _ETRAX_TYPES_H #define _ETRAX_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,18 +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, just like our other addresses. */ typedef u32 dma_addr_t; |