diff options
| author | Jaswinder Singh Rajput <jaswinder@kernel.org> | 2009-08-12 22:49:47 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-16 18:25:00 -0700 |
| commit | 3f389635102e0dd2f85ebfe7fd549942b5bbc33b (patch) | |
| tree | 60e7647410d9874296608a646d8485f6a824fe08 /arch | |
| parent | 48e46b7b311c54525712c28004f0a59f2c931d30 (diff) | |
| download | linux-3f389635102e0dd2f85ebfe7fd549942b5bbc33b.tar.gz linux-3f389635102e0dd2f85ebfe7fd549942b5bbc33b.tar.bz2 linux-3f389635102e0dd2f85ebfe7fd549942b5bbc33b.zip | |
SPARC: fix duplicate declaration
Only difference for 32 and 64 bit version is dma64_addr_t and rest is same.
Also fixed the following 'make includecheck' warning:
arch/sparc/include/asm/types.h: asm-generic/int-ll64.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/include/asm/types.h | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/arch/sparc/include/asm/types.h b/arch/sparc/include/asm/types.h index de671d73baed..09c79a9c8516 100644 --- a/arch/sparc/include/asm/types.h +++ b/arch/sparc/include/asm/types.h @@ -8,9 +8,8 @@ * need to be careful to avoid a name clashes. */ -#if defined(__sparc__) && defined(__arch64__) +#if defined(__sparc__) -/*** SPARC 64 bit ***/ #include <asm-generic/int-ll64.h> #ifndef __ASSEMBLY__ @@ -26,33 +25,21 @@ typedef unsigned short umode_t; /* Dma addresses come in generic and 64-bit flavours. */ typedef u32 dma_addr_t; -typedef u64 dma64_addr_t; -#endif /* __ASSEMBLY__ */ +#if defined(__arch64__) -#endif /* __KERNEL__ */ +/*** SPARC 64 bit ***/ +typedef u64 dma64_addr_t; #else - /*** SPARC 32 bit ***/ -#include <asm-generic/int-ll64.h> - -#ifndef __ASSEMBLY__ - -typedef unsigned short umode_t; - -#endif /* __ASSEMBLY__ */ - -#ifdef __KERNEL__ - -#ifndef __ASSEMBLY__ - -typedef u32 dma_addr_t; typedef u32 dma64_addr_t; +#endif /* defined(__arch64__) */ + #endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */ -#endif /* defined(__sparc__) && defined(__arch64__) */ +#endif /* defined(__sparc__) */ #endif /* defined(_SPARC_TYPES_H) */ |