diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
| commit | f1da2c3860e301527d56a1ef0b56c649ee7c4b1b (patch) | |
| tree | 562b5d2e8b9cb62eb983d78ff6bcf9789e08fcf6 /drivers/mtd/docprobe.c | |
| parent | 00f11569ac8ca73cbcdef8822de1583e79aee571 (diff) | |
Merge with Linux 2.4.0-test5-pre1. This works again on Origin UP.
The IP22 cache bugs which are plaguing some machines are still unfixed.
Diffstat (limited to 'drivers/mtd/docprobe.c')
| -rw-r--r-- | drivers/mtd/docprobe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/docprobe.c b/drivers/mtd/docprobe.c index 5feb64901..7ab0a2d74 100644 --- a/drivers/mtd/docprobe.c +++ b/drivers/mtd/docprobe.c @@ -3,7 +3,7 @@ /* Probe routines common to all DoC devices */ /* (c) 1999 Machine Vision Holdings, Inc. */ /* Author: David Woodhouse <dwmw2@mvhi.com> */ -/* $Id: docprobe.c,v 1.8 2000/06/26 20:40:53 dwmw2 Exp $ */ +/* $Id: docprobe.c,v 1.10 2000/07/13 14:23:20 dwmw2 Exp $ */ @@ -206,7 +206,7 @@ static void DoC_Probe(unsigned long physadr) case DOC_ChipID_DocMil: name="Millennium"; #ifdef CONFIG_MTD_DOC2001 - initroutine = &DocMil_init; + initroutine = &DoCMil_init; #elif CONFIG_MODULES initroutinedynamic=1; initroutine = (void *)get_module_symbol(NULL, "DoCMil_init"); @@ -252,7 +252,7 @@ int __init init_doc(void) printk(KERN_NOTICE "M-Systems DiskOnChip driver. (C) 1999 Machine Vision Holdings, Inc.\n"); #ifdef PRERELEASE - printk(KERN_INFO "$Id: docprobe.c,v 1.8 2000/06/26 20:40:53 dwmw2 Exp $\n"); + printk(KERN_INFO "$Id: docprobe.c,v 1.10 2000/07/13 14:23:20 dwmw2 Exp $\n"); #endif for (i=0; doc_locations[i]; i++) { |