diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /arch/mips/lib/ide-no.c | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'arch/mips/lib/ide-no.c')
| -rw-r--r-- | arch/mips/lib/ide-no.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/mips/lib/ide-no.c b/arch/mips/lib/ide-no.c index 5a11e0383..77a388c8b 100644 --- a/arch/mips/lib/ide-no.c +++ b/arch/mips/lib/ide-no.c @@ -1,4 +1,4 @@ -/* $Id: ide-no.c,v 1.2 1998/05/28 03:17:57 ralf Exp $ +/* $Id: ide-no.c,v 1.2 1998/06/30 00:21:54 ralf Exp $ * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -7,12 +7,13 @@ * Stub IDE routines to keep Linux from crashing on machine which don't * have IDE like the Indy. * - * Copyright (C) 1998 by Ralf Baechle + * Copyright (C) 1998, 1999 by Ralf Baechle */ #include <linux/hdreg.h> #include <linux/kernel.h> +#include <linux/ide.h> +#include <asm/hdreg.h> #include <asm/ptrace.h> -#include <asm/ide.h> static int no_ide_default_irq(ide_ioreg_t base) { @@ -24,15 +25,15 @@ static ide_ioreg_t no_ide_default_io_base(int index) return 0; } -static void no_ide_init_hwif_ports(ide_ioreg_t *p, ide_ioreg_t base, - int *irq) +static void no_ide_init_hwif_ports (hw_regs_t *hw, ide_ioreg_t data_port, + ide_ioreg_t ctrl_port, int *irq) { } static int no_ide_request_irq(unsigned int irq, - void (*handler)(int,void *, struct pt_regs *), - unsigned long flags, const char *device, - void *dev_id) + void (*handler)(int,void *, struct pt_regs *), + unsigned long flags, const char *device, + void *dev_id) { panic("no_no_ide_request_irq called - shouldn't happen"); } |