Commit 3f389635 authored by Jaswinder Singh Rajput's avatar Jaswinder Singh Rajput Committed by David S. Miller

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: default avatarJaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 48e46b7b
...@@ -8,9 +8,8 @@ ...@@ -8,9 +8,8 @@
* need to be careful to avoid a name clashes. * 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> #include <asm-generic/int-ll64.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
...@@ -26,33 +25,21 @@ typedef unsigned short umode_t; ...@@ -26,33 +25,21 @@ typedef unsigned short umode_t;
/* Dma addresses come in generic and 64-bit flavours. */ /* Dma addresses come in generic and 64-bit flavours. */
typedef u32 dma_addr_t; 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 #else
/*** SPARC 32 bit ***/ /*** 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; typedef u32 dma64_addr_t;
#endif /* defined(__arch64__) */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* defined(__sparc__) && defined(__arch64__) */ #endif /* defined(__sparc__) */
#endif /* defined(_SPARC_TYPES_H) */ #endif /* defined(_SPARC_TYPES_H) */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment