diff options
author | H. Peter Anvin <hpa@zytor.com> | 2008-04-06 13:35:07 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-05-02 19:18:31 -0400 |
commit | 8523437b4c664cfc0f11998c4274846b95182000 (patch) | |
tree | 908db99a12fceb3347af8899010760db5a850675 /include | |
parent | 23cf11ddb5099f8c7f7cb3eb154bff0faf31cae9 (diff) |
mn10300: types: use <asm-generic/int-*.h> for the mn10300 architecture
This modifies <asm-mn10300/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-mn10300/types.h | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/include/asm-mn10300/types.h b/include/asm-mn10300/types.h index d40ea7628bfc..7b9f01042fd4 100644 --- a/include/asm-mn10300/types.h +++ b/include/asm-mn10300/types.h | |||
@@ -11,29 +11,12 @@ | |||
11 | #ifndef _ASM_TYPES_H | 11 | #ifndef _ASM_TYPES_H |
12 | #define _ASM_TYPES_H | 12 | #define _ASM_TYPES_H |
13 | 13 | ||
14 | #include <asm-generic/int-ll64.h> | ||
15 | |||
14 | #ifndef __ASSEMBLY__ | 16 | #ifndef __ASSEMBLY__ |
15 | 17 | ||
16 | typedef unsigned short umode_t; | 18 | typedef unsigned short umode_t; |
17 | 19 | ||
18 | /* | ||
19 | * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the | ||
20 | * header files exported to user space | ||
21 | */ | ||
22 | |||
23 | typedef __signed__ char __s8; | ||
24 | typedef unsigned char __u8; | ||
25 | |||
26 | typedef __signed__ short __s16; | ||
27 | typedef unsigned short __u16; | ||
28 | |||
29 | typedef __signed__ int __s32; | ||
30 | typedef unsigned int __u32; | ||
31 | |||
32 | #if defined(__GNUC__) && !defined(__STRICT_ANSI__) | ||
33 | typedef __signed__ long long __s64; | ||
34 | typedef unsigned long long __u64; | ||
35 | #endif | ||
36 | |||
37 | #endif /* __ASSEMBLY__ */ | 20 | #endif /* __ASSEMBLY__ */ |
38 | 21 | ||
39 | /* | 22 | /* |
@@ -45,18 +28,6 @@ typedef unsigned long long __u64; | |||
45 | 28 | ||
46 | #ifndef __ASSEMBLY__ | 29 | #ifndef __ASSEMBLY__ |
47 | 30 | ||
48 | typedef signed char s8; | ||
49 | typedef unsigned char u8; | ||
50 | |||
51 | typedef signed short s16; | ||
52 | typedef unsigned short u16; | ||
53 | |||
54 | typedef signed int s32; | ||
55 | typedef unsigned int u32; | ||
56 | |||
57 | typedef signed long long s64; | ||
58 | typedef unsigned long long u64; | ||
59 | |||
60 | /* Dma addresses are 32-bits wide. */ | 31 | /* Dma addresses are 32-bits wide. */ |
61 | typedef u32 dma_addr_t; | 32 | typedef u32 dma_addr_t; |
62 | 33 | ||