diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-06-06 23:35:43 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 08:42:19 +0400 |
| commit | b444b9a5a1171ef07e1a87b01f7bb5bd0206d012 (patch) | |
| tree | 1fc1082a05e20680adece9d4f0c45a4f8f7df82f /include/asm-sparc64 | |
| parent | c6d1b0e3d2b71ded7c457c2c9f1ab8c2c957aafe (diff) | |
| download | linux-b444b9a5a1171ef07e1a87b01f7bb5bd0206d012.tar.xz | |
sparc: Merge asm-sparc{,64}/types.h
Copy content of sparc64 file to sparc file.
There is only minimal possibilities for further unification.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/types.h | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/include/asm-sparc64/types.h b/include/asm-sparc64/types.h index b27ccc85202f..cfbfad5043eb 100644 --- a/include/asm-sparc64/types.h +++ b/include/asm-sparc64/types.h @@ -1,34 +1 @@ -#ifndef _SPARC64_TYPES_H -#define _SPARC64_TYPES_H - -/* - * This file is never included by application software unless - * explicitly requested (e.g., via linux/types.h) in which case the - * application is Linux specific so (user-) name space pollution is - * not a major issue. However, for interoperability, libraries still - * need to be careful to avoid a name clashes. - */ -#include <asm-generic/int-l64.h> - -#ifndef __ASSEMBLY__ - -typedef unsigned short umode_t; - -#endif /* __ASSEMBLY__ */ - -#ifdef __KERNEL__ - -#define BITS_PER_LONG 64 - -#ifndef __ASSEMBLY__ - -/* Dma addresses come in generic and 64-bit flavours. */ - -typedef u32 dma_addr_t; -typedef u64 dma64_addr_t; - -#endif /* __ASSEMBLY__ */ - -#endif /* __KERNEL__ */ - -#endif /* defined(_SPARC64_TYPES_H) */ +#include <asm-sparc/types.h> |