The patch titled
add-dma-engine-driver-for-freescale-mpc85xx-processors fix
has been added to the -mm tree. Its filename is
add-dma-engine-driver-for-freescale-mpc85xx-processors-fix.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: add-dma-engine-driver-for-freescale-mpc85xx-processors fix
From: Kamalesh Babulal <kamalesh@xxxxxxxxxxxxxxxxxx>
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 <kamalesh@xxxxxxxxxxxxxxxxxx>
Cc: Zhang Wei <wei.zhang@xxxxxxxxxxxxx>
c: Ebony Zhu <ebony.zhu@xxxxxxxxxxxxx>
Cc: "Williams, Dan J" <dan.j.williams@xxxxxxxxx>
Cc: Shannon Nelson <shannon.nelson@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Kumar Gala <galak@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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));
_
Patches currently in -mm which might be from kamalesh@xxxxxxxxxxxxxxxxxx are
origin.patch
rpadlpar_sysfsc-unbork.patch
sclp_cpi_sysc-unbork.patch
add-dma-engine-driver-for-freescale-mpc85xx-processors-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
