add-dma-engine-driver-for-freescale-mpc85xx-processors-fix
commit9e87e6c39b61a7768ff6fca60a29a93e7b3c934e
authorKamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Fri, 9 Nov 2007 07:22:32 +0000 (9 07:22 +0000)
committerMatthias Urlichs <smurf@hera.kernel.org>
Wed, 14 Nov 2007 11:31:10 +0000 (14 11:31 +0000)
treea462ace49cae4e6fe82b5162baf5a116321045b8
parentf124a3bf7404491ea490f852c60351f3df40fbdd
add-dma-engine-driver-for-freescale-mpc85xx-processors-fix

  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@linux.vnet.ibm.com>
Cc: Zhang Wei <wei.zhang@freescale.com>
c: Ebony Zhu <ebony.zhu@freescale.com>
Cc: "Williams, Dan J" <dan.j.williams@intel.com>
Cc: Shannon Nelson <shannon.nelson@intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Kumar Gala <galak@gate.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/dma/fsldma.h