2004-11-30 01:58:55

by maximilian attems

[permalink] [raw]
Subject: [patch 04/11] Subject: ifdef typos: arch_ppc_syslib_ppc4xx_dma.c



ppc4xx_dma.h defines PPC4xx_DMA_64BIT.

Signed-off-by: Domen Puncer <[email protected]>
Acked-by: Randy Dunlap <[email protected]>
Signed-off-by: Maximilian Attems <[email protected]>

---

linux-2.6.10-rc2-bk13-max/arch/ppc/syslib/ppc4xx_dma.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/ppc/syslib/ppc4xx_dma.c~ifdef-arch_ppc_syslib_ppc4xx_dma arch/ppc/syslib/ppc4xx_dma.c
--- linux-2.6.10-rc2-bk13/arch/ppc/syslib/ppc4xx_dma.c~ifdef-arch_ppc_syslib_ppc4xx_dma 2004-11-30 02:41:35.000000000 +0100
+++ linux-2.6.10-rc2-bk13-max/arch/ppc/syslib/ppc4xx_dma.c 2004-11-30 02:41:35.000000000 +0100
@@ -48,7 +48,7 @@ ppc4xx_set_src_addr(int dmanr, phys_addr
return;
}

-#ifdef PPC4xx_DMA64BIT
+#ifdef PPC4xx_DMA_64BIT
mtdcr(DCRN_DMASAH0 + dmanr*2, (u32)(src_addr >> 32));
#else
mtdcr(DCRN_DMASA0 + dmanr*2, (u32)src_addr);
@@ -63,7 +63,7 @@ ppc4xx_set_dst_addr(int dmanr, phys_addr
return;
}

-#ifdef PPC4xx_DMA64BIT
+#ifdef PPC4xx_DMA_64BIT
mtdcr(DCRN_DMADAH0 + dmanr*2, (u32)(dst_addr >> 32));
#else
mtdcr(DCRN_DMADA0 + dmanr*2, (u32)dst_addr);
_