diff options
| author | Jon Loeliger <linuxppc@jdl.com> | 2005-09-21 15:54:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-22 07:03:33 -0400 |
| commit | b8f114db84dac709080198e08a5564976afd6579 (patch) | |
| tree | 6680ab0ae0d189ea5b4ec729bfedb352e859d412 /arch | |
| parent | e903c5b536895fdf69970df62c5bf49ad17e6533 (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')
| -rw-r--r-- | arch/ppc/kernel/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index 8b06b8e00332..77fecfbabe88 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c | |||
| @@ -71,7 +71,8 @@ struct ide_machdep_calls ppc_ide_md; | |||
| 71 | unsigned long boot_mem_size; | 71 | unsigned long boot_mem_size; |
| 72 | 72 | ||
| 73 | unsigned long ISA_DMA_THRESHOLD; | 73 | unsigned long ISA_DMA_THRESHOLD; |
| 74 | unsigned long DMA_MODE_READ, DMA_MODE_WRITE; | 74 | unsigned int DMA_MODE_READ; |
| 75 | unsigned int DMA_MODE_WRITE; | ||
| 75 | 76 | ||
| 76 | #ifdef CONFIG_PPC_MULTIPLATFORM | 77 | #ifdef CONFIG_PPC_MULTIPLATFORM |
| 77 | int _machine = 0; | 78 | int _machine = 0; |