From d70f8cefa078ff831b7875d8ee2d997668b19273 Mon Sep 17 00:00:00 2001 From: Yoshihiro Takahashi Date: Wed, 12 Jul 2000 10:15:43 +0000 Subject: [PATCH] Backed out a part of previous commit. The function name conflicts. Pointed out by: haro@tk.kubota.co.jp (Munehiro Matsuda) --- sys/pc98/cbus/gdc.c | 4 ++-- sys/pc98/pc98/pc98gdc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c index a3f8afb640c..c87274beee5 100644 --- a/sys/pc98/cbus/gdc.c +++ b/sys/pc98/cbus/gdc.c @@ -108,7 +108,7 @@ gdc_identify(driver_t *driver, device_t parent) } static int -gdc_probe(device_t dev) +gdcprobe(device_t dev) { gdc_softc_t *sc; @@ -235,7 +235,7 @@ gdcmmap(dev_t dev, vm_offset_t offset, int prot) static device_method_t gdc_methods[] = { DEVMETHOD(device_identify, gdc_identify), - DEVMETHOD(device_probe, gdc_probe), + DEVMETHOD(device_probe, gdcprobe), DEVMETHOD(device_attach, gdc_attach), { 0, 0 } }; diff --git a/sys/pc98/pc98/pc98gdc.c b/sys/pc98/pc98/pc98gdc.c index a3f8afb640c..c87274beee5 100644 --- a/sys/pc98/pc98/pc98gdc.c +++ b/sys/pc98/pc98/pc98gdc.c @@ -108,7 +108,7 @@ gdc_identify(driver_t *driver, device_t parent) } static int -gdc_probe(device_t dev) +gdcprobe(device_t dev) { gdc_softc_t *sc; @@ -235,7 +235,7 @@ gdcmmap(dev_t dev, vm_offset_t offset, int prot) static device_method_t gdc_methods[] = { DEVMETHOD(device_identify, gdc_identify), - DEVMETHOD(device_probe, gdc_probe), + DEVMETHOD(device_probe, gdcprobe), DEVMETHOD(device_attach, gdc_attach), { 0, 0 } };