diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/sbus/dvma.c | |
parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/sbus/dvma.c')
-rw-r--r-- | drivers/sbus/dvma.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/sbus/dvma.c b/drivers/sbus/dvma.c index 31153efbc..ec7f2a275 100644 --- a/drivers/sbus/dvma.c +++ b/drivers/sbus/dvma.c @@ -138,24 +138,24 @@ __initfunc(void sun4_dvma_init(void)) struct Linux_SBus_DMA *dchain; if(sun4_dma_physaddr) { - dma = kmalloc(sizeof(struct Linux_SBus_DMA), GFP_ATOMIC); + dma = kmalloc(sizeof(struct Linux_SBus_DMA), GFP_ATOMIC); - /* No SBUS */ - dma->SBus_dev = 0x0; + /* No SBUS */ + dma->SBus_dev = 0x0; - /* Only one DMA device */ - dma_chain=dma; + /* Only one DMA device */ + dma_chain=dma; - dma->regs = (struct sparc_dma_registers *) - sparc_alloc_io (sun4_dma_physaddr, 0, - PAGE_SIZE, "dma", 0x0, 0x0); + dma->regs = (struct sparc_dma_registers *) + sparc_alloc_io (sun4_dma_physaddr, 0, + PAGE_SIZE, "dma", 0x0, 0x0); - /* No prom node */ - dma->node = 0x0; + /* No prom node */ + dma->node = 0x0; - init_one_dvma(dma, 0); + init_one_dvma(dma, 0); } else { - dma_chain=0x0; + dma_chain=0x0; } } |