Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/sparc/include/asm/types.h

+7 −20
Original line number Diff line number Diff line
@@ -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) */