diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 10:25:27 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 10:25:27 -0400 |
commit | a8bd4683134affa76f2edd3a6b8b526832722242 (patch) | |
tree | 8d94a9535c6d1d4a77dc7593f1c1b84a0c220b5f /arch | |
parent | 84f8369015bd4ea9f487a164a3b08d5ec96d6fe1 (diff) |
sh: Convert to asm-generic/types.h.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh/include/asm/types.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/sh/include/asm/types.h b/arch/sh/include/asm/types.h index b13caca62a76..c7f3c94837dd 100644 --- a/arch/sh/include/asm/types.h +++ b/arch/sh/include/asm/types.h | |||
@@ -1,27 +1,14 @@ | |||
1 | #ifndef __ASM_SH_TYPES_H | 1 | #ifndef __ASM_SH_TYPES_H |
2 | #define __ASM_SH_TYPES_H | 2 | #define __ASM_SH_TYPES_H |
3 | 3 | ||
4 | #include <asm-generic/int-ll64.h> | 4 | #include <asm-generic/types.h> |
5 | |||
6 | #ifndef __ASSEMBLY__ | ||
7 | |||
8 | typedef unsigned short umode_t; | ||
9 | |||
10 | #endif /* __ASSEMBLY__ */ | ||
11 | 5 | ||
12 | /* | 6 | /* |
13 | * These aren't exported outside the kernel to avoid name space clashes | 7 | * These aren't exported outside the kernel to avoid name space clashes |
14 | */ | 8 | */ |
15 | #ifdef __KERNEL__ | 9 | #ifdef __KERNEL__ |
16 | |||
17 | #define BITS_PER_LONG 32 | ||
18 | |||
19 | #ifndef __ASSEMBLY__ | 10 | #ifndef __ASSEMBLY__ |
20 | 11 | ||
21 | /* Dma addresses are 32-bits wide. */ | ||
22 | |||
23 | typedef u32 dma_addr_t; | ||
24 | |||
25 | #ifdef CONFIG_SUPERH32 | 12 | #ifdef CONFIG_SUPERH32 |
26 | typedef u16 insn_size_t; | 13 | typedef u16 insn_size_t; |
27 | #else | 14 | #else |
@@ -29,7 +16,6 @@ typedef u32 insn_size_t; | |||
29 | #endif | 16 | #endif |
30 | 17 | ||
31 | #endif /* __ASSEMBLY__ */ | 18 | #endif /* __ASSEMBLY__ */ |
32 | |||
33 | #endif /* __KERNEL__ */ | 19 | #endif /* __KERNEL__ */ |
34 | 20 | ||
35 | #endif /* __ASM_SH_TYPES_H */ | 21 | #endif /* __ASM_SH_TYPES_H */ |