summaryrefslogtreecommitdiff
path: root/sys/dev/mca
diff options
context:
space:
mode:
authorbouyer <bouyer@NetBSD.org>2012-07-31 15:50:31 +0000
committerbouyer <bouyer@NetBSD.org>2012-07-31 15:50:31 +0000
commitaee187e7a26ea9ba93b45c0bbcd0fdd490c6c497 (patch)
tree934c95ddcb0012348fd3eed617f4d0cb81445f12 /sys/dev/mca
parentb2061654b40cbc50de035c4291bfd62bee95faa7 (diff)
Apply back changes that were reverted on Jul 24 and Jul 26 (general ata/wdc
cleanup and SATA PMP support), now that I'm back to fix the fallouts.
Diffstat (limited to 'sys/dev/mca')
-rw-r--r--sys/dev/mca/ed_mca.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c
index ecbfdb4dd96..25f017c5f69 100644
--- a/sys/dev/mca/ed_mca.c
+++ b/sys/dev/mca/ed_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.51 2012/07/24 14:04:30 jakllsch Exp $ */
+/* $NetBSD: ed_mca.c,v 1.52 2012/07/31 15:50:35 bouyer Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.51 2012/07/24 14:04:30 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.52 2012/07/31 15:50:35 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -440,7 +440,7 @@ edgetdisklabel(dev_t dev, struct ed_softc *ed)
*/
#if 0
if (wd->drvp->state > RECAL)
- wd->drvp->drive_flags |= DRIVE_RESET;
+ wd->drvp->drive_flags |= ATA_DRIVE_RESET;
#endif
errstring = readdisklabel(EDLABELDEV(dev),
edmcastrategy, lp, ed->sc_dk.dk_cpulabel);
@@ -492,7 +492,7 @@ edmcaioctl(dev_t dev, u_long xfer, void *addr, int flag, struct lwp *l)
if (error == 0) {
#if 0
if (wd->drvp->state > RECAL)
- wd->drvp->drive_flags |= DRIVE_RESET;
+ wd->drvp->drive_flags |= ATA_DRIVE_RESET;
#endif
if (xfer == DIOCWDINFO)
error = writedisklabel(EDLABELDEV(dev),