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 | 4cc1a102b049ff2890e3a97c23ca88e7205b42fd (patch) | |
| tree | aa50764f44f85c4e0fea40eb19c44dd929786cc3 /include | |
| parent | 3726c23df8e4d95b6f2b335dfa90e3f4850a8a00 (diff) | |
arm: types: use <asm-generic/int-*.h> for the arm architecture
This modifies <asm-arm/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Cc: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/types.h | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/include/asm-arm/types.h b/include/asm-arm/types.h index 3141451a9bd..345df01534a 100644 --- a/include/asm-arm/types.h +++ b/include/asm-arm/types.h @@ -1,29 +1,12 @@ #ifndef __ASM_ARM_TYPES_H #define __ASM_ARM_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. */ typedef u32 dma_addr_t; |