diff options
author | H. Peter Anvin <hpa@zytor.com> | 2008-04-06 13:35:04 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-05-02 19:18:21 -0400 |
commit | 861531555dfac342c1c40668af8ac2f88af26e71 (patch) | |
tree | 9ab2c92543f04211fe8ebffcd8aa12bbb37cf2dc /include | |
parent | 8f337b5399302e41ed44e999e0cc518f92d0a509 (diff) |
h8300: types: use <asm-generic/int-*.h> for the h8300 architecture
This modifies <asm-h8300/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-h8300/types.h | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/include/asm-h8300/types.h b/include/asm-h8300/types.h index 56566e2a09fd..12875190b156 100644 --- a/include/asm-h8300/types.h +++ b/include/asm-h8300/types.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _H8300_TYPES_H | 1 | #ifndef _H8300_TYPES_H |
2 | #define _H8300_TYPES_H | 2 | #define _H8300_TYPES_H |
3 | 3 | ||
4 | #include <asm-generic/int-ll64.h> | ||
5 | |||
4 | #if !defined(__ASSEMBLY__) | 6 | #if !defined(__ASSEMBLY__) |
5 | 7 | ||
6 | /* | 8 | /* |
@@ -14,41 +16,10 @@ | |||
14 | typedef unsigned short umode_t; | 16 | typedef unsigned short umode_t; |
15 | 17 | ||
16 | /* | 18 | /* |
17 | * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the | ||
18 | * header files exported to user space | ||
19 | */ | ||
20 | |||
21 | typedef __signed__ char __s8; | ||
22 | typedef unsigned char __u8; | ||
23 | |||
24 | typedef __signed__ short __s16; | ||
25 | typedef unsigned short __u16; | ||
26 | |||
27 | typedef __signed__ int __s32; | ||
28 | typedef unsigned int __u32; | ||
29 | |||
30 | #if defined(__GNUC__) | ||
31 | __extension__ typedef __signed__ long long __s64; | ||
32 | __extension__ typedef unsigned long long __u64; | ||
33 | #endif | ||
34 | |||
35 | /* | ||
36 | * These aren't exported outside the kernel to avoid name space clashes | 19 | * These aren't exported outside the kernel to avoid name space clashes |
37 | */ | 20 | */ |
38 | #ifdef __KERNEL__ | 21 | #ifdef __KERNEL__ |
39 | 22 | ||
40 | typedef signed char s8; | ||
41 | typedef unsigned char u8; | ||
42 | |||
43 | typedef signed short s16; | ||
44 | typedef unsigned short u16; | ||
45 | |||
46 | typedef signed int s32; | ||
47 | typedef unsigned int u32; | ||
48 | |||
49 | typedef signed long long s64; | ||
50 | typedef unsigned long long u64; | ||
51 | |||
52 | #define BITS_PER_LONG 32 | 23 | #define BITS_PER_LONG 32 |
53 | 24 | ||
54 | /* Dma addresses are 32-bits wide. */ | 25 | /* Dma addresses are 32-bits wide. */ |