Subject: ifdef typos: arch_ppc_syslib_ppc4xx_dma.c

PATCH Applied [email protected] 1 participant 1 message Nov 30, 2004

lore

Share & tools

lore

[email protected]

author

2004-11-30 01:58 UTC #0 lore raw

PATCH 4/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(-)

arch/ppc/syslib/ppc4xx_dma.c renamed from arch/ppc/syslib/ppc4xx_dma.c~ifdef-arch_ppc_syslib_ppc4xx_dma +2 -2

diff -puN arch/ppc/syslib/ppc4xx_dma.c~ifdef-arch_ppc_syslib_ppc4xx_dma arch/ppc/syslib/ppc4xx_dma.c
@@ -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);