PATCH powerpc Merge asm-ppc*/dma.h
This patch merges the asm-ppc*/dma.h files.
Signed-off-by Jon Loeliger <[email protected]>
Signed-off-by Kumar Gala <[email protected]>
---
arch/ppc/kernel/setup.c | 3 include/asm-powerpc/dma.h | 390 +++++++++++++++++++++++++++++++++++++++++++++ include/asm-ppc/dma.h | 371 ------------------------------------------- include/asm-ppc64/dma.h | 329 -------------------------------------- 4 files changed, 392 insertions(+), 701 deletions(-)
arch/ppc/kernel/setup.c +2 -1
@@ -71,7 +71,8 @@ struct ide_machdep_calls ppc_ide_md;unsigned long boot_mem_size;unsigned long ISA_DMA_THRESHOLD ; -unsigned long DMA_MODE_READ ,DMA_MODE_WRITE ; +unsigned int DMA_MODE_READ ; +unsigned int DMA_MODE_WRITE ;#ifdef CONFIG_PPC_MULTIPLATFORM int _machine =0 ;
include/asm-powerpc/dma.h new file +390 -0
390 lines not on this page · raw message
include/asm-ppc/dma.h deleted +0 -371
371 lines not on this page · raw message
include/asm-ppc64/dma.h deleted +0 -329
329 lines not on this page · raw message