From a41bd31e53cce764c5bc6861ce6be4074cc59551 Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Mon, 6 Sep 2010 19:20:25 +0000
Subject: All PWR_{SUSPEND,RESUME} can now be replaced by
 DVACT_{SUSPEND,RESUME}

---
 sys/dev/pci/auich.c | 4 ++--
 sys/dev/pci/pci.c   | 6 +++---
 sys/dev/pci/yds.c   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'sys/dev/pci')

diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index a27ce5b68cb..9e7ea163089 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auich.c,v 1.89 2010/08/31 17:13:44 deraadt Exp $	*/
+/*	$OpenBSD: auich.c,v 1.90 2010/09/06 19:20:22 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2000,2001 Michael Shalayeff
@@ -555,7 +555,7 @@ auich_attach(parent, self, aux)
 	sc->audiodev = audio_attach_mi(&auich_hw_if, sc, &sc->sc_dev);
 
 	/* Watch for power changes */
-	sc->suspend = PWR_RESUME;
+	sc->suspend = DVACT_RESUME;
 	sc->powerhook = powerhook_establish(auich_powerhook, sc);
 
 	sc->sc_ac97rate = -1;
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 6a88d510961..46d4fd8b39c 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci.c,v 1.84 2010/09/05 18:14:33 kettenis Exp $	*/
+/*	$OpenBSD: pci.c,v 1.85 2010/09/06 19:20:23 deraadt Exp $	*/
 /*	$NetBSD: pci.c,v 1.31 1997/06/06 23:48:04 thorpej Exp $	*/
 
 /*
@@ -218,10 +218,10 @@ void
 pcipowerhook(int why, void *arg)
 {
 	switch (why) {
-	case PWR_SUSPEND:
+	case DVACT_SUSPEND:
 		pci_suspend(arg);
 		break;
-	case PWR_RESUME:
+	case DVACT_RESUME:
 		pci_resume(arg);
 		break;
 	}
diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c
index ad2a339d462..530c5bf1c88 100644
--- a/sys/dev/pci/yds.c
+++ b/sys/dev/pci/yds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yds.c,v 1.35 2010/08/27 18:50:57 deraadt Exp $	*/
+/*	$OpenBSD: yds.c,v 1.36 2010/09/06 19:20:23 deraadt Exp $	*/
 /*	$NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $	*/
 
 /*
@@ -822,7 +822,7 @@ yds_attachhook(void *xsc)
 	audio_attach_mi(&yds_hw_if, sc, &sc->sc_dev);
 
 	/* Watch for power changes */
-	sc->suspend = PWR_RESUME;
+	sc->suspend = DVACT_RESUME;
 	sc->powerhook = powerhook_establish(yds_powerhook, sc);
 
 	yds_configure_legacy(sc);
-- 
cgit v1.2.3