diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
| commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
| tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /include/asm-mips/parport.h | |
| parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) | |
Merge with Linux 2.3.41.
Diffstat (limited to 'include/asm-mips/parport.h')
| -rw-r--r-- | include/asm-mips/parport.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-mips/parport.h b/include/asm-mips/parport.h index dcf0ff69d..0ae99c2e9 100644 --- a/include/asm-mips/parport.h +++ b/include/asm-mips/parport.h @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: parport.h,v 1.1 1999/10/09 00:01:43 ralf Exp $ * * parport.h: ia32-specific parport initialisation * @@ -39,16 +39,16 @@ parport_pc_init(int *io, int *io_hi, int *irq, int *dma) do { if (!*io_hi) *io_hi = 0x400 + *io; if (parport_pc_probe_port(*(io++), *(io_hi++), - *(irq++), *(dma++))) + *(irq++), *(dma++), NULL)) count++; } while (*io && (++i < PARPORT_PC_MAX_PORTS)); } else { /* Probe all the likely ports. */ - if (parport_pc_probe_port(0x3bc, 0x7bc, irq[0], dma[0])) + if (parport_pc_probe_port(0x3bc, 0x7bc, irq[0], dma[0], NULL)) count++; - if (parport_pc_probe_port(0x378, 0x778, irq[0], dma[0])) + if (parport_pc_probe_port(0x378, 0x778, irq[0], dma[0], NULL)) count++; - if (parport_pc_probe_port(0x278, 0x678, irq[0], dma[0])) + if (parport_pc_probe_port(0x278, 0x678, irq[0], dma[0], NULL)) count++; count += parport_pc_init_pci (irq[0], dma[0]); } |