diff options
Diffstat (limited to 'include/asm-sparc64')
-rw-r--r-- | include/asm-sparc64/types.h | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/include/asm-sparc64/types.h b/include/asm-sparc64/types.h index d0ee7f105838..5dbe04f4044a 100644 --- a/include/asm-sparc64/types.h +++ b/include/asm-sparc64/types.h | |||
@@ -9,28 +9,12 @@ | |||
9 | * not a major issue. However, for interoperability, libraries still | 9 | * not a major issue. However, for interoperability, libraries still |
10 | * need to be careful to avoid a name clashes. | 10 | * need to be careful to avoid a name clashes. |
11 | */ | 11 | */ |
12 | #include <asm-generic/int-l64.h> | ||
12 | 13 | ||
13 | #ifndef __ASSEMBLY__ | 14 | #ifndef __ASSEMBLY__ |
14 | 15 | ||
15 | typedef unsigned short umode_t; | 16 | typedef unsigned short umode_t; |
16 | 17 | ||
17 | /* | ||
18 | * _xx is ok: it doesn't pollute the POSIX namespace. Use these in the | ||
19 | * header files exported to user space. | ||
20 | */ | ||
21 | |||
22 | typedef __signed__ char __s8; | ||
23 | typedef unsigned char __u8; | ||
24 | |||
25 | typedef __signed__ short __s16; | ||
26 | typedef unsigned short __u16; | ||
27 | |||
28 | typedef __signed__ int __s32; | ||
29 | typedef unsigned int __u32; | ||
30 | |||
31 | typedef __signed__ long __s64; | ||
32 | typedef unsigned long __u64; | ||
33 | |||
34 | #endif /* __ASSEMBLY__ */ | 18 | #endif /* __ASSEMBLY__ */ |
35 | 19 | ||
36 | #ifdef __KERNEL__ | 20 | #ifdef __KERNEL__ |
@@ -39,18 +23,6 @@ typedef unsigned long __u64; | |||
39 | 23 | ||
40 | #ifndef __ASSEMBLY__ | 24 | #ifndef __ASSEMBLY__ |
41 | 25 | ||
42 | typedef __signed__ char s8; | ||
43 | typedef unsigned char u8; | ||
44 | |||
45 | typedef __signed__ short s16; | ||
46 | typedef unsigned short u16; | ||
47 | |||
48 | typedef __signed__ int s32; | ||
49 | typedef unsigned int u32; | ||
50 | |||
51 | typedef __signed__ long s64; | ||
52 | typedef unsigned long u64; | ||
53 | |||
54 | /* Dma addresses come in generic and 64-bit flavours. */ | 26 | /* Dma addresses come in generic and 64-bit flavours. */ |
55 | 27 | ||
56 | typedef u32 dma_addr_t; | 28 | typedef u32 dma_addr_t; |