diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-frv/types.h | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/include/asm-frv/types.h b/include/asm-frv/types.h index 767e5ed71c4b..613bf1e962f0 100644 --- a/include/asm-frv/types.h +++ b/include/asm-frv/types.h | |||
@@ -12,29 +12,12 @@ | |||
12 | #ifndef _ASM_TYPES_H | 12 | #ifndef _ASM_TYPES_H |
13 | #define _ASM_TYPES_H | 13 | #define _ASM_TYPES_H |
14 | 14 | ||
15 | #include <asm-generic/int-ll64.h> | ||
16 | |||
15 | #ifndef __ASSEMBLY__ | 17 | #ifndef __ASSEMBLY__ |
16 | 18 | ||
17 | typedef unsigned short umode_t; | 19 | typedef unsigned short umode_t; |
18 | 20 | ||
19 | /* | ||
20 | * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the | ||
21 | * header files exported to user space | ||
22 | */ | ||
23 | |||
24 | typedef __signed__ char __s8; | ||
25 | typedef unsigned char __u8; | ||
26 | |||
27 | typedef __signed__ short __s16; | ||
28 | typedef unsigned short __u16; | ||
29 | |||
30 | typedef __signed__ int __s32; | ||
31 | typedef unsigned int __u32; | ||
32 | |||
33 | #if defined(__GNUC__) | ||
34 | __extension__ typedef __signed__ long long __s64; | ||
35 | __extension__ typedef unsigned long long __u64; | ||
36 | #endif | ||
37 | |||
38 | #endif /* __ASSEMBLY__ */ | 21 | #endif /* __ASSEMBLY__ */ |
39 | 22 | ||
40 | /* | 23 | /* |
@@ -46,19 +29,6 @@ __extension__ typedef unsigned long long __u64; | |||
46 | 29 | ||
47 | #ifndef __ASSEMBLY__ | 30 | #ifndef __ASSEMBLY__ |
48 | 31 | ||
49 | |||
50 | typedef signed char s8; | ||
51 | typedef unsigned char u8; | ||
52 | |||
53 | typedef signed short s16; | ||
54 | typedef unsigned short u16; | ||
55 | |||
56 | typedef signed int s32; | ||
57 | typedef unsigned int u32; | ||
58 | |||
59 | typedef signed long long s64; | ||
60 | typedef unsigned long long u64; | ||
61 | |||
62 | /* Dma addresses are 32-bits wide. */ | 32 | /* Dma addresses are 32-bits wide. */ |
63 | 33 | ||
64 | typedef u32 dma_addr_t; | 34 | typedef u32 dma_addr_t; |