From: Kamalesh Babulal CC net/9p/error.o drivers/dma/fsldma.h:152: error: conflicting types for `in_be64' include/asm/io.h:136: error: previous definition of `in_be64' was here drivers/dma/fsldma.h:157: error: conflicting types for `out_be64' include/asm/io.h:135: error: previous definition of `out_be64' was here drivers/dma/fsldma.h:164: error: conflicting types for `in_le64' include/asm/io.h:140: error: previous definition of `in_le64' was here drivers/dma/fsldma.h:169: error: conflicting types for `out_le64' include/asm/io.h:145: error: previous definition of `out_le64' was here drivers/dma/fsldma.c:504: error: implicit declaration of function `bus_to_virt' The following patch solves the conflict types error, but the bus_to_virt is under the CONFIG_PPC32 ifdef and we had a discuss on the same for the availability of the function for ppc64 at http://lkml.org/lkml/2007/10/17/524 Signed-off-by: Kamalesh Babulal Cc: Zhang Wei c: Ebony Zhu Cc: "Williams, Dan J" Cc: Shannon Nelson Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Kumar Gala Signed-off-by: Andrew Morton --- drivers/dma/fsldma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/dma/fsldma.h~add-dma-engine-driver-for-freescale-mpc85xx-processors-fix drivers/dma/fsldma.h --- a/drivers/dma/fsldma.h~add-dma-engine-driver-for-freescale-mpc85xx-processors-fix +++ a/drivers/dma/fsldma.h @@ -147,7 +147,7 @@ struct fsl_dma_chan { #define to_fsl_desc(lh) container_of(lh, struct fsl_desc_sw, node) #define tx_to_fsl_desc(tx) container_of(tx, struct fsl_desc_sw, async_tx) -#ifndef __powerpc64 +#ifndef __powerpc64__ static u64 in_be64(const u64 __iomem *addr) { return ((u64)in_be32((u32 *)addr) << 32) | (in_be32((u32 *)addr + 1)); _