aboutsummaryrefslogtreecommitdiff
path: root/arch/ppc/kernel
diff options
context:
space:
mode:
authorJon Loeliger <linuxppc@jdl.com>2005-09-21 14:54:51 -0500
committerPaul Mackerras <paulus@samba.org>2005-09-22 21:03:33 +1000
commitb8f114db84dac709080198e08a5564976afd6579 (patch)
tree6680ab0ae0d189ea5b4ec729bfedb352e859d412 /arch/ppc/kernel
parente903c5b536895fdf69970df62c5bf49ad17e6533 (diff)
[PATCH] powerpc: Merge asm-ppc*/dma.h
This merges the asm-ppc*/dma.h files. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/kernel')
-rw-r--r--arch/ppc/kernel/setup.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index 8b06b8e0033..77fecfbabe8 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -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;