From owner-svn-src-head@FreeBSD.ORG  Sun Nov  2 17:35:15 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 90D3E1065675;
	Sun,  2 Nov 2008 17:35:15 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7478F8FC13;
	Sun,  2 Nov 2008 17:35:15 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA2HZFJU044308;
	Sun, 2 Nov 2008 17:35:15 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA2HZFNT044307;
	Sun, 2 Nov 2008 17:35:15 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200811021735.mA2HZFNT044307@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 2 Nov 2008 17:35:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184563 - head/sys/dev/acpica
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Nov 2008 17:35:15 -0000

Author: imp
Date: Sun Nov  2 17:35:15 2008
New Revision: 184563
URL: http://svn.freebsd.org/changeset/base/184563

Log:
  Make the no driver stuff an ifdef.

Modified:
  head/sys/dev/acpica/acpi.c

Modified: head/sys/dev/acpica/acpi.c
==============================================================================
--- head/sys/dev/acpica/acpi.c	Sun Nov  2 17:04:54 2008	(r184562)
+++ head/sys/dev/acpica/acpi.c	Sun Nov  2 17:35:15 2008	(r184563)
@@ -789,8 +789,9 @@ acpi_print_child(device_t bus, device_t 
 static void
 acpi_probe_nomatch(device_t bus, device_t child)
 {
-
-    /* pci_set_powerstate(child, PCI_POWERSTATE_D3); */
+#ifdef ACPI_ENABLE_POWERDOWN_NODRIVER
+    pci_set_powerstate(child, PCI_POWERSTATE_D3);
+#endif
 }
 
 /*
@@ -810,9 +811,13 @@ acpi_driver_added(device_t dev, driver_t
     for (i = 0; i < numdevs; i++) {
 	child = devlist[i];
 	if (device_get_state(child) == DS_NOTPRESENT) {
-	    /* pci_set_powerstate(child, PCI_POWERSTATE_D0); */
+#ifdef ACPI_ENABLE_POWERDOWN_NODRIVER
+	    pci_set_powerstate(child, PCI_POWERSTATE_D0);
 	    if (device_probe_and_attach(child) != 0)
-		; /* pci_set_powerstate(child, PCI_POWERSTATE_D3); */
+		pci_set_powerstate(child, PCI_POWERSTATE_D3);
+#else
+	    device_probe_and_attach(child);
+#endif
 	}
     }
     free(devlist, M_TEMP);