diff --git a/sys/dev/ata/atavar.h b/sys/dev/ata/atavar.h
index e2dddbffc9c5..45838ff2afc9 100644
--- a/sys/dev/ata/atavar.h
+++ b/sys/dev/ata/atavar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: atavar.h,v 1.60 2004/08/20 06:39:38 thorpej Exp $	*/
+/*	$NetBSD: atavar.h,v 1.61 2004/08/20 17:19:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -270,8 +270,8 @@ struct ata_command {
 struct ata_bustype {
 	int	bustype_type;	/* symbolic name of type */
 	int	(*ata_bio)(struct ata_drive_datas *, struct ata_bio *);
-	void	(*ata_reset_channel)(struct ata_drive_datas *, int);
-/* extra flags for ata_reset_channel(), in addition to AT_* */
+	void	(*ata_reset_drive)(struct ata_drive_datas *, int);
+/* extra flags for ata_reset_drive(), in addition to AT_* */
 #define AT_RST_EMERG 0x10000 /* emergency - e.g. for a dump */
 #define	AT_RST_NOCMD 0x20000 /* XXX has to go - temporary until we have tagged queuing */
 
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 9d2e464b9666..fd149f6d7348 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.289 2004/08/13 04:10:49 thorpej Exp $ */
+/*	$NetBSD: wd.c,v 1.290 2004/08/20 17:19:44 thorpej Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.289 2004/08/13 04:10:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.290 2004/08/20 17:19:44 thorpej Exp $");
 
 #ifndef ATADEBUG
 #define ATADEBUG
@@ -756,7 +756,7 @@ wddone(void *v)
 		errmsg = "error";
 		do_perror = 1;
 retry:		/* Just reset and retry. Can we do more ? */
-		wd->atabus->ata_reset_channel(wd->drvp, 0);
+		(*wd->atabus->ata_reset_drive)(wd->drvp, 0);
 retry2:
 		diskerr(bp, "wd", errmsg, LOG_PRINTF,
 		    wd->sc_wdc_bio.blkdone, wd->sc_dk.dk_label);
@@ -1458,7 +1458,8 @@ wddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
 	if (wddumprecalibrated == 0) {
 		wddumpmulti = wd->sc_multi;
 		wddumprecalibrated = 1;
-		wd->atabus->ata_reset_channel(wd->drvp, AT_POLL | AT_RST_EMERG);
+		(*wd->atabus->ata_reset_drive)(wd->drvp,
+					       AT_POLL | AT_RST_EMERG);
 		wd->drvp->state = RESET;
 	}