Module Name: src
Committed By: jruoho
Date: Tue Apr 27 08:37:07 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_apm.c acpivar.h
Log Message:
Include the new prototype for acpi_enter_sleep_state().
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/acpi/acpi_apm.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/acpi/acpivar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_apm.c
diff -u src/sys/dev/acpi/acpi_apm.c:1.18 src/sys/dev/acpi/acpi_apm.c:1.19
--- src/sys/dev/acpi/acpi_apm.c:1.18 Mon Apr 12 06:56:19 2010
+++ src/sys/dev/acpi/acpi_apm.c Tue Apr 27 08:37:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_apm.c,v 1.18 2010/04/12 06:56:19 skrll Exp $ */
+/* $NetBSD: acpi_apm.c,v 1.19 2010/04/27 08:37:07 jruoho Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_apm.c,v 1.18 2010/04/12 06:56:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_apm.c,v 1.19 2010/04/27 08:37:07 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -97,7 +97,7 @@
static int acpiapm_node = CTL_EOL, standby_node = CTL_EOL;
struct acpi_softc;
-extern ACPI_STATUS acpi_enter_sleep_state(struct acpi_softc *, int);
+extern void acpi_enter_sleep_state(struct acpi_softc *, int);
static int acpiapm_match(device_t, cfdata_t , void *);
static void acpiapm_attach(device_t, device_t, void *);
static int sysctl_state(SYSCTLFN_PROTO);
Index: src/sys/dev/acpi/acpivar.h
diff -u src/sys/dev/acpi/acpivar.h:1.52 src/sys/dev/acpi/acpivar.h:1.53
--- src/sys/dev/acpi/acpivar.h:1.52 Thu Apr 22 18:53:23 2010
+++ src/sys/dev/acpi/acpivar.h Tue Apr 27 08:37:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpivar.h,v 1.52 2010/04/22 18:53:23 jruoho Exp $ */
+/* $NetBSD: acpivar.h,v 1.53 2010/04/27 08:37:07 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -294,7 +294,7 @@
/*
* Sleep state transition.
*/
-ACPI_STATUS acpi_enter_sleep_state(struct acpi_softc *, int);
+void acpi_enter_sleep_state(struct acpi_softc *, int);
/*
* Quirk handling.
