From owner-p4-projects@FreeBSD.ORG  Fri Apr  2 14:22:01 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1254616A4D2; Fri,  2 Apr 2004 14:22:01 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DBC1516A4CF
	for <perforce@freebsd.org>; Fri,  2 Apr 2004 14:22:00 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D501B43D1F
	for <perforce@freebsd.org>; Fri,  2 Apr 2004 14:22:00 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i32MM0Ge025314
	for <perforce@freebsd.org>; Fri, 2 Apr 2004 14:22:00 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i32MM0EL025302
	for perforce@freebsd.org; Fri, 2 Apr 2004 14:22:00 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Fri, 2 Apr 2004 14:22:00 -0800 (PST)
Message-Id: <200404022222.i32MM0EL025302@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 50214 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Apr 2004 22:22:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=50214

Change 50214 by jhb@jhb_slimer on 2004/04/02 14:21:41

	Compile fixes.

Affected files ...

.. //depot/projects/power/sys/dev/acpica/acpi.c#14 edit
.. //depot/projects/power/sys/dev/acpica/acpi_pci.c#9 edit
.. //depot/projects/power/sys/pci/if_dc.c#10 edit

Differences ...

==== //depot/projects/power/sys/dev/acpica/acpi.c#14 (text+ko) ====

@@ -1711,7 +1711,7 @@
 acpi_GetPowerState(ACPI_HANDLE handle, int *state)
 {
 
-	return (acpi_EvaluateInteger(handle, "_PSC", state));
+	return (acpi_GetInteger(handle, "_PSC", state));
 }
 
 /*

==== //depot/projects/power/sys/dev/acpica/acpi_pci.c#9 (text+ko) ====

@@ -69,7 +69,6 @@
     device_t child, char *buf, size_t buflen);
 
 
-#if 0
 static int	acpi_pci_set_powerstate_method(device_t dev, device_t child,
     int state);
 static ACPI_STATUS acpi_pci_save_handle(ACPI_HANDLE handle, UINT32 level,
@@ -156,7 +155,6 @@
     return (0);
 }
 
-#if 0
 /*
  * PCI power manangement
  */

==== //depot/projects/power/sys/pci/if_dc.c#10 (text+ko) ====

@@ -3767,7 +3767,7 @@
 dc_suspend(device_t dev)
 {
 	struct dc_softc *sc;
-	int i, s;
+	int s;
 
 	s = splimp();
 
@@ -3791,7 +3791,7 @@
 {
 	struct dc_softc *sc;
 	struct ifnet *ifp;
-	int i, s;
+	int s;
 
 	s = splimp();