Module Name: src
Committed By: jruoho
Date: Fri Mar 5 14:00:17 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c acpi_acad.c acpi_apm.c acpi_bat.c
acpi_button.c acpi_ec.c acpi_lid.c acpi_madt.c acpi_pci.c
acpi_pci_link.c acpi_powerres.c acpi_quirks.c acpi_resource.c
acpi_slit.c acpi_srat.c acpi_timer.c acpi_tz.c acpi_wakedev.c
aiboost.c asus_acpi.c atk0110.c atppc_acpi.c attimer_acpi.c
com_acpi.c dalb_acpi.c fdc_acpi.c hpet_acpi.c hpqlb_acpi.c
joy_acpi.c lpt_acpi.c mpu_acpi.c pckbc_acpi.c pcppi_acpi.c
smbus_acpi.c sony_acpi.c spic_acpi.c thinkpad_acpi.c ug_acpi.c
wb_acpi.c wmi_acpi.c wss_acpi.c ym_acpi.c
Log Message:
Remove <dev/acpi/acpica.h> from all files. It is included from
<dev/acpi/acpivar.h>. Ditto for <dev/sysmon/sysmonvar.h>, <sys/bus.h>,
<dev/pci/pcivar.h>, and <dev/isa/isavar.h>.
Also nuke a lot of unused and invalid headers. Some of these are audibly
provided by standard headers (namely <sys/param.h> and <sys/device.h>), some
have nothing to do with ACPI devices (e.g. <sys/syslog.h>), and some are
nonexistent local includes (e.g. "mpu_ym.h"). Moreoever, try to group the
includes into their respective blocks.
Tested with GENERIC and ALL (i386). No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/acpi/acpi_acad.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/acpi/acpi_apm.c \
src/sys/dev/acpi/acpi_timer.c src/sys/dev/acpi/sony_acpi.c \
src/sys/dev/acpi/wmi_acpi.c
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/acpi/acpi_bat.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/acpi/acpi_button.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/acpi/acpi_ec.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/acpi/acpi_lid.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/acpi/acpi_madt.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/acpi_pci.c \
src/sys/dev/acpi/acpi_slit.c src/sys/dev/acpi/acpi_srat.c \
src/sys/dev/acpi/acpi_wakedev.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/acpi/acpi_pci_link.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/acpi/acpi_powerres.c \
src/sys/dev/acpi/acpi_quirks.c src/sys/dev/acpi/ym_acpi.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/acpi/acpi_resource.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/acpi/acpi_tz.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/acpi/aiboost.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/acpi/asus_acpi.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/acpi/atk0110.c \
src/sys/dev/acpi/dalb_acpi.c src/sys/dev/acpi/smbus_acpi.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/acpi/atppc_acpi.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/acpi/attimer_acpi.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/acpi/com_acpi.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/acpi/fdc_acpi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/hpet_acpi.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/hpqlb_acpi.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/joy_acpi.c \
src/sys/dev/acpi/mpu_acpi.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/acpi/lpt_acpi.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/acpi/pckbc_acpi.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/acpi/pcppi_acpi.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/spic_acpi.c \
src/sys/dev/acpi/ug_acpi.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/acpi/thinkpad_acpi.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/wb_acpi.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/acpi/wss_acpi.c
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.c
diff -u src/sys/dev/acpi/acpi.c:1.154 src/sys/dev/acpi/acpi.c:1.155
--- src/sys/dev/acpi/acpi.c:1.154 Thu Mar 4 23:25:07 2010
+++ src/sys/dev/acpi/acpi.c Fri Mar 5 14:00:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.154 2010/03/04 23:25:07 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.155 2010/03/05 14:00:16 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -70,27 +70,26 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.154 2010/03/04 23:25:07 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.155 2010/03/05 14:00:16 jruoho Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/sysctl.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_osd.h>
+#include <dev/acpi/acpi_pci.h>
#include <dev/acpi/acpi_timer.h>
#include <dev/acpi/acpi_wakedev.h>
-#include <dev/acpi/acpi_pci.h>
+
#ifdef ACPIVERBOSE
#include <dev/acpi/acpidevs_data.h>
#endif
Index: src/sys/dev/acpi/acpi_acad.c
diff -u src/sys/dev/acpi/acpi_acad.c:1.41 src/sys/dev/acpi/acpi_acad.c:1.42
--- src/sys/dev/acpi/acpi_acad.c:1.41 Sun Feb 28 17:22:41 2010
+++ src/sys/dev/acpi/acpi_acad.c Fri Mar 5 14:00:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_acad.c,v 1.41 2010/02/28 17:22:41 jruoho Exp $ */
+/* $NetBSD: acpi_acad.c,v 1.42 2010/03/05 14:00:16 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,20 +40,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.41 2010/02/28 17:22:41 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.42 2010/03/05 14:00:16 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
#include <sys/module.h>
#include <sys/mutex.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
-#include <dev/sysmon/sysmonvar.h>
-
#define _COMPONENT ACPI_ACAD_COMPONENT
ACPI_MODULE_NAME ("acpi_acad")
Index: src/sys/dev/acpi/acpi_apm.c
diff -u src/sys/dev/acpi/acpi_apm.c:1.14 src/sys/dev/acpi/acpi_apm.c:1.15
--- src/sys/dev/acpi/acpi_apm.c:1.14 Mon Apr 28 20:23:47 2008
+++ src/sys/dev/acpi/acpi_apm.c Fri Mar 5 14:00:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_apm.c,v 1.14 2008/04/28 20:23:47 martin Exp $ */
+/* $NetBSD: acpi_apm.c,v 1.15 2010/03/05 14:00:16 jruoho Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -35,20 +35,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_apm.c,v 1.14 2008/04/28 20:23:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_apm.c,v 1.15 2010/03/05 14:00:16 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/sysctl.h>
-#include <sys/select.h>
-#include <sys/envsys.h>
-#include <dev/sysmon/sysmonvar.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
+#include <dev/acpi/acpivar.h>
#include <dev/apm/apmvar.h>
static void acpiapm_disconnect(void *);
Index: src/sys/dev/acpi/acpi_timer.c
diff -u src/sys/dev/acpi/acpi_timer.c:1.14 src/sys/dev/acpi/acpi_timer.c:1.15
--- src/sys/dev/acpi/acpi_timer.c:1.14 Wed Apr 8 00:15:45 2009
+++ src/sys/dev/acpi/acpi_timer.c Fri Mar 5 14:00:17 2010
@@ -1,14 +1,16 @@
-/* $NetBSD: acpi_timer.c,v 1.14 2009/04/08 00:15:45 dyoung Exp $ */
+/* $NetBSD: acpi_timer.c,v 1.15 2010/03/05 14:00:17 jruoho Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_timer.c,v 1.14 2009/04/08 00:15:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_timer.c,v 1.15 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/types.h>
#include <sys/systm.h>
#include <sys/time.h>
#include <sys/timetc.h>
-#include <dev/acpi/acpica.h>
+
+#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_timer.h>
+
#include <machine/acpi_machdep.h>
static int acpitimer_test(void);
Index: src/sys/dev/acpi/sony_acpi.c
diff -u src/sys/dev/acpi/sony_acpi.c:1.14 src/sys/dev/acpi/sony_acpi.c:1.15
--- src/sys/dev/acpi/sony_acpi.c:1.14 Tue Mar 2 18:44:47 2010
+++ src/sys/dev/acpi/sony_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sony_acpi.c,v 1.14 2010/03/02 18:44:47 jruoho Exp $ */
+/* $NetBSD: sony_acpi.c,v 1.15 2010/03/05 14:00:17 jruoho Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -29,21 +29,14 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.14 2010/03/02 18:44:47 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.15 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/proc.h>
-#include <sys/kernel.h>
-#include <sys/callout.h>
#include <sys/sysctl.h>
+#include <sys/systm.h>
-#include <machine/bus.h>
-
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
#define _COMPONENT ACPI_RESOURCE_COMPONENT
ACPI_MODULE_NAME ("sony_acpi")
Index: src/sys/dev/acpi/wmi_acpi.c
diff -u src/sys/dev/acpi/wmi_acpi.c:1.14 src/sys/dev/acpi/wmi_acpi.c:1.15
--- src/sys/dev/acpi/wmi_acpi.c:1.14 Sun Feb 28 13:56:49 2010
+++ src/sys/dev/acpi/wmi_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_acpi.c,v 1.14 2010/02/28 13:56:49 jruoho Exp $ */
+/* $NetBSD: wmi_acpi.c,v 1.15 2010/03/05 14:00:17 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,12 +27,13 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.14 2010/02/28 13:56:49 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.15 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/endian.h>
#include <sys/kmem.h>
+#include <sys/systm.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
Index: src/sys/dev/acpi/acpi_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.83 src/sys/dev/acpi/acpi_bat.c:1.84
--- src/sys/dev/acpi/acpi_bat.c:1.83 Sun Feb 28 17:22:41 2010
+++ src/sys/dev/acpi/acpi_bat.c Fri Mar 5 14:00:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.83 2010/02/28 17:22:41 jruoho Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.84 2010/03/05 14:00:16 jruoho Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -75,19 +75,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.83 2010/02/28 17:22:41 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.84 2010/03/05 14:00:16 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h> /* for hz */
-#include <sys/kmem.h>
+#include <sys/condvar.h>
#include <sys/device.h>
+#include <sys/kernel.h>
+#include <sys/kmem.h>
#include <sys/module.h>
#include <sys/mutex.h>
+#include <sys/systm.h>
-#include <dev/sysmon/sysmonvar.h>
-
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
Index: src/sys/dev/acpi/acpi_button.c
diff -u src/sys/dev/acpi/acpi_button.c:1.33 src/sys/dev/acpi/acpi_button.c:1.34
--- src/sys/dev/acpi/acpi_button.c:1.33 Thu Mar 4 23:06:36 2010
+++ src/sys/dev/acpi/acpi_button.c Fri Mar 5 14:00:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_button.c,v 1.33 2010/03/04 23:06:36 jruoho Exp $ */
+/* $NetBSD: acpi_button.c,v 1.34 2010/03/05 14:00:16 jruoho Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,18 +40,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.33 2010/03/04 23:06:36 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.34 2010/03/05 14:00:16 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
#include <sys/module.h>
+#include <sys/systm.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
-#include <dev/sysmon/sysmonvar.h>
-
#define _COMPONENT ACPI_BUTTON_COMPONENT
ACPI_MODULE_NAME ("acpi_button")
Index: src/sys/dev/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.61 src/sys/dev/acpi/acpi_ec.c:1.62
--- src/sys/dev/acpi/acpi_ec.c:1.61 Tue Mar 2 18:44:46 2010
+++ src/sys/dev/acpi/acpi_ec.c Fri Mar 5 14:00:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.61 2010/03/02 18:44:46 jruoho Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.62 2010/03/05 14:00:16 jruoho Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -59,17 +59,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.61 2010/03/02 18:44:46 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.62 2010/03/05 14:00:16 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/callout.h>
#include <sys/condvar.h>
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/mutex.h>
-
-#include <sys/bus.h>
+#include <sys/systm.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
Index: src/sys/dev/acpi/acpi_lid.c
diff -u src/sys/dev/acpi/acpi_lid.c:1.35 src/sys/dev/acpi/acpi_lid.c:1.36
--- src/sys/dev/acpi/acpi_lid.c:1.35 Sun Feb 28 17:22:41 2010
+++ src/sys/dev/acpi/acpi_lid.c Fri Mar 5 14:00:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_lid.c,v 1.35 2010/02/28 17:22:41 jruoho Exp $ */
+/* $NetBSD: acpi_lid.c,v 1.36 2010/03/05 14:00:16 jruoho Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,19 +40,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.35 2010/02/28 17:22:41 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.36 2010/03/05 14:00:16 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
#include <sys/module.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
-#include <dev/sysmon/sysmonvar.h>
-
#define _COMPONENT ACPI_LID_COMPONENT
ACPI_MODULE_NAME ("acpi_lid")
Index: src/sys/dev/acpi/acpi_madt.c
diff -u src/sys/dev/acpi/acpi_madt.c:1.20 src/sys/dev/acpi/acpi_madt.c:1.21
--- src/sys/dev/acpi/acpi_madt.c:1.20 Tue Mar 2 18:44:47 2010
+++ src/sys/dev/acpi/acpi_madt.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_madt.c,v 1.20 2010/03/02 18:44:47 jruoho Exp $ */
+/* $NetBSD: acpi_madt.c,v 1.21 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,17 +36,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.20 2010/03/02 18:44:47 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.21 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/ioctl.h>
#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_madt.h>
Index: src/sys/dev/acpi/acpi_pci.c
diff -u src/sys/dev/acpi/acpi_pci.c:1.2 src/sys/dev/acpi/acpi_pci.c:1.3
--- src/sys/dev/acpi/acpi_pci.c:1.2 Fri Dec 4 10:42:39 2009
+++ src/sys/dev/acpi/acpi_pci.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci.c,v 1.2 2009/12/04 10:42:39 njoly Exp $ */
+/* $NetBSD: acpi_pci.c,v 1.3 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -33,18 +33,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci.c,v 1.2 2009/12/04 10:42:39 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci.c,v 1.3 2010/03/05 14:00:17 jruoho Exp $");
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
-
-#include <sys/bus.h>
#include <sys/kmem.h>
-#include <dev/pci/pcivar.h>
+#include <sys/queue.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_pci.h>
Index: src/sys/dev/acpi/acpi_slit.c
diff -u src/sys/dev/acpi/acpi_slit.c:1.2 src/sys/dev/acpi/acpi_slit.c:1.3
--- src/sys/dev/acpi/acpi_slit.c:1.2 Fri Dec 4 10:42:39 2009
+++ src/sys/dev/acpi/acpi_slit.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_slit.c,v 1.2 2009/12/04 10:42:39 njoly Exp $ */
+/* $NetBSD: acpi_slit.c,v 1.3 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,12 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_slit.c,v 1.2 2009/12/04 10:42:39 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_slit.c,v 1.3 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
+#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_slit.h>
static ACPI_TABLE_SLIT *slit;
Index: src/sys/dev/acpi/acpi_srat.c
diff -u src/sys/dev/acpi/acpi_srat.c:1.2 src/sys/dev/acpi/acpi_srat.c:1.3
--- src/sys/dev/acpi/acpi_srat.c:1.2 Fri Dec 4 10:42:39 2009
+++ src/sys/dev/acpi/acpi_srat.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_srat.c,v 1.2 2009/12/04 10:42:39 njoly Exp $ */
+/* $NetBSD: acpi_srat.c,v 1.3 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,14 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_srat.c,v 1.2 2009/12/04 10:42:39 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_srat.c,v 1.3 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-
#include <sys/kmem.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_srat.h>
Index: src/sys/dev/acpi/acpi_wakedev.c
diff -u src/sys/dev/acpi/acpi_wakedev.c:1.2 src/sys/dev/acpi/acpi_wakedev.c:1.3
--- src/sys/dev/acpi/acpi_wakedev.c:1.2 Tue Aug 4 17:06:10 2009
+++ src/sys/dev/acpi/acpi_wakedev.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakedev.c,v 1.2 2009/08/04 17:06:10 jmcneill Exp $ */
+/* $NetBSD: acpi_wakedev.c,v 1.3 2010/03/05 14:00:17 jruoho Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,18 +27,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.2 2009/08/04 17:06:10 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.3 2010/03/05 14:00:17 jruoho Exp $");
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/kmem.h>
#include <sys/device.h>
+#include <sys/kmem.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_wakedev.h>
struct acpi_wakedev;
Index: src/sys/dev/acpi/acpi_pci_link.c
diff -u src/sys/dev/acpi/acpi_pci_link.c:1.15 src/sys/dev/acpi/acpi_pci_link.c:1.16
--- src/sys/dev/acpi/acpi_pci_link.c:1.15 Wed Sep 16 10:47:54 2009
+++ src/sys/dev/acpi/acpi_pci_link.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci_link.c,v 1.15 2009/09/16 10:47:54 mlelstv Exp $ */
+/* $NetBSD: acpi_pci_link.c,v 1.16 2010/03/05 14:00:17 jruoho Exp $ */
/*-
* Copyright (c) 2002 Mitsuru IWASAKI <iwas...@jp.freebsd.org>
@@ -27,21 +27,21 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.15 2009/09/16 10:47:54 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.16 2010/03/05 14:00:17 jruoho Exp $");
-#include "opt_acpi.h"
#include <sys/param.h>
-#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/queue.h>
#include <sys/reboot.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
+
+#include "opt_acpi.h"
+
#define _COMPONENT ACPI_BUS_COMPONENT
ACPI_MODULE_NAME ("acpi_pci_link")
Index: src/sys/dev/acpi/acpi_powerres.c
diff -u src/sys/dev/acpi/acpi_powerres.c:1.10 src/sys/dev/acpi/acpi_powerres.c:1.11
--- src/sys/dev/acpi/acpi_powerres.c:1.10 Tue Mar 2 18:44:47 2010
+++ src/sys/dev/acpi/acpi_powerres.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_powerres.c,v 1.10 2010/03/02 18:44:47 jruoho Exp $ */
+/* $NetBSD: acpi_powerres.c,v 1.11 2010/03/05 14:00:17 jruoho Exp $ */
/*-
* Copyright (c) 2001 Michael Smith
@@ -29,16 +29,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_powerres.c,v 1.10 2010/03/02 18:44:47 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_powerres.c,v 1.11 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/malloc.h>
-#include <sys/conf.h>
-#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
Index: src/sys/dev/acpi/acpi_quirks.c
diff -u src/sys/dev/acpi/acpi_quirks.c:1.10 src/sys/dev/acpi/acpi_quirks.c:1.11
--- src/sys/dev/acpi/acpi_quirks.c:1.10 Sun Jan 25 02:26:30 2009
+++ src/sys/dev/acpi/acpi_quirks.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_quirks.c,v 1.10 2009/01/25 02:26:30 christos Exp $ */
+/* $NetBSD: acpi_quirks.c,v 1.11 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -37,19 +37,14 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_quirks.c,v 1.10 2009/01/25 02:26:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_quirks.c,v 1.11 2010/03/05 14:00:17 jruoho Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
static int acpi_rev_cmp(uint32_t, uint32_t, int);
Index: src/sys/dev/acpi/ym_acpi.c
diff -u src/sys/dev/acpi/ym_acpi.c:1.10 src/sys/dev/acpi/ym_acpi.c:1.11
--- src/sys/dev/acpi/ym_acpi.c:1.10 Wed Aug 19 00:31:16 2009
+++ src/sys/dev/acpi/ym_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ym_acpi.c,v 1.10 2009/08/19 00:31:16 jmcneill Exp $ */
+/* $NetBSD: ym_acpi.c,v 1.11 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2006 Jasper Wallace <jas...@pointless.net>
@@ -29,21 +29,19 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.10 2009/08/19 00:31:16 jmcneill Exp $");
-
-#include "mpu_ym.h"
+__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.11 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/bus.h>
+#include <sys/systm.h>
#include <dev/acpi/acpivar.h>
#include <dev/audio_if.h>
#include <dev/ic/ad1848reg.h>
-#include <dev/isa/ad1848var.h>
-
#include <dev/ic/opl3sa3reg.h>
+
+#include <dev/isa/ad1848var.h>
#include <dev/isa/wssreg.h>
#include <dev/isa/ymvar.h>
Index: src/sys/dev/acpi/acpi_resource.c
diff -u src/sys/dev/acpi/acpi_resource.c:1.31 src/sys/dev/acpi/acpi_resource.c:1.32
--- src/sys/dev/acpi/acpi_resource.c:1.31 Tue Mar 2 18:44:47 2010
+++ src/sys/dev/acpi/acpi_resource.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_resource.c,v 1.31 2010/03/02 18:44:47 jruoho Exp $ */
+/* $NetBSD: acpi_resource.c,v 1.32 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,13 +67,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.31 2010/03/02 18:44:47 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.32 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
Index: src/sys/dev/acpi/acpi_tz.c
diff -u src/sys/dev/acpi/acpi_tz.c:1.60 src/sys/dev/acpi/acpi_tz.c:1.61
--- src/sys/dev/acpi/acpi_tz.c:1.60 Fri Mar 5 12:44:16 2010
+++ src/sys/dev/acpi/acpi_tz.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.60 2010/03/05 12:44:16 pgoyette Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.61 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,20 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.60 2010/03/05 12:44:16 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.61 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/syslog.h>
#include <sys/device.h>
#include <sys/callout.h>
-#include <sys/proc.h>
-#include <dev/sysmon/sysmonvar.h>
+#include <sys/kernel.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
Index: src/sys/dev/acpi/aiboost.c
diff -u src/sys/dev/acpi/aiboost.c:1.29 src/sys/dev/acpi/aiboost.c:1.30
--- src/sys/dev/acpi/aiboost.c:1.29 Tue Mar 2 18:44:47 2010
+++ src/sys/dev/acpi/aiboost.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: aiboost.c,v 1.29 2010/03/02 18:44:47 jruoho Exp $ */
+/* $NetBSD: aiboost.c,v 1.30 2010/03/05 14:00:17 jruoho Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines
@@ -28,23 +28,20 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aiboost.c,v 1.29 2010/03/02 18:44:47 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aiboost.c,v 1.30 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
#include <sys/mutex.h>
#include <sys/kmem.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#define _COMPONENT ACPI_RESOURCE_COMPONENT
ACPI_MODULE_NAME ("aiboost")
-#include <dev/sysmon/sysmonvar.h>
-
#ifdef AIBOOST_DEBUG
#define DPRINTF(x) do { printf x; } while (/* CONSTCOND */ 0)
#else
Index: src/sys/dev/acpi/asus_acpi.c
diff -u src/sys/dev/acpi/asus_acpi.c:1.17 src/sys/dev/acpi/asus_acpi.c:1.18
--- src/sys/dev/acpi/asus_acpi.c:1.17 Wed Feb 24 22:37:56 2010
+++ src/sys/dev/acpi/asus_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: asus_acpi.c,v 1.17 2010/02/24 22:37:56 dyoung Exp $ */
+/* $NetBSD: asus_acpi.c,v 1.18 2010/03/05 14:00:17 jruoho Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,19 +27,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.17 2010/02/24 22:37:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.18 2010/03/05 14:00:17 jruoho Exp $");
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/malloc.h>
-#include <sys/buf.h>
-#include <sys/callout.h>
-#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/sysctl.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
#define _COMPONENT ACPI_RESOURCE_COMPONENT
ACPI_MODULE_NAME ("asus_acpi")
Index: src/sys/dev/acpi/atk0110.c
diff -u src/sys/dev/acpi/atk0110.c:1.8 src/sys/dev/acpi/atk0110.c:1.9
--- src/sys/dev/acpi/atk0110.c:1.8 Thu Mar 4 20:17:30 2010
+++ src/sys/dev/acpi/atk0110.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atk0110.c,v 1.8 2010/03/04 20:17:30 jruoho Exp $ */
+/* $NetBSD: atk0110.c,v 1.9 2010/03/05 14:00:17 jruoho Exp $ */
/* $OpenBSD: atk0110.c,v 1.1 2009/07/23 01:38:16 cnst Exp $ */
/*
@@ -18,14 +18,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.8 2010/03/04 20:17:30 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.9 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
#include <sys/malloc.h>
-
-#include <dev/sysmon/sysmonvar.h>
+#include <sys/systm.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
Index: src/sys/dev/acpi/dalb_acpi.c
diff -u src/sys/dev/acpi/dalb_acpi.c:1.8 src/sys/dev/acpi/dalb_acpi.c:1.9
--- src/sys/dev/acpi/dalb_acpi.c:1.8 Tue Mar 2 18:44:47 2010
+++ src/sys/dev/acpi/dalb_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dalb_acpi.c,v 1.8 2010/03/02 18:44:47 jruoho Exp $ */
+/* $NetBSD: dalb_acpi.c,v 1.9 2010/03/05 14:00:17 jruoho Exp $ */
/*-
* Copyright (c) 2008 Christoph Egger <ceg...@netbsd.org>
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.8 2010/03/02 18:44:47 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.9 2010/03/05 14:00:17 jruoho Exp $");
/*
* Direct Application Launch Button:
@@ -35,18 +35,12 @@
*/
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/proc.h>
-#include <sys/kernel.h>
-#include <sys/callout.h>
#include <sys/sysctl.h>
+#include <sys/systm.h>
-#include <machine/bus.h>
-
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
#define _COMPONENT ACPI_RESOURCE_COMPONENT
ACPI_MODULE_NAME ("dalb_acpi")
Index: src/sys/dev/acpi/smbus_acpi.c
diff -u src/sys/dev/acpi/smbus_acpi.c:1.8 src/sys/dev/acpi/smbus_acpi.c:1.9
--- src/sys/dev/acpi/smbus_acpi.c:1.8 Thu Mar 4 20:46:18 2010
+++ src/sys/dev/acpi/smbus_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: smbus_acpi.c,v 1.8 2010/03/04 20:46:18 jruoho Exp $ */
+/* $NetBSD: smbus_acpi.c,v 1.9 2010/03/05 14:00:17 jruoho Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -36,20 +36,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbus_acpi.c,v 1.8 2010/03/04 20:46:18 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbus_acpi.c,v 1.9 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/syslog.h>
#include <sys/device.h>
#include <sys/callout.h>
-#include <sys/proc.h>
+#include <sys/kernel.h>
#include <sys/mutex.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
Index: src/sys/dev/acpi/atppc_acpi.c
diff -u src/sys/dev/acpi/atppc_acpi.c:1.16 src/sys/dev/acpi/atppc_acpi.c:1.17
--- src/sys/dev/acpi/atppc_acpi.c:1.16 Tue Feb 17 12:46:01 2009
+++ src/sys/dev/acpi/atppc_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_acpi.c,v 1.16 2009/02/17 12:46:01 jmcneill Exp $ */
+/* $NetBSD: atppc_acpi.c,v 1.17 2010/03/05 14:00:17 jruoho Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,29 +30,20 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.16 2009/02/17 12:46:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.17 2010/03/05 14:00:17 jruoho Exp $");
#include "opt_atppc.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
+#include <sys/systm.h>
#include <sys/termios.h>
-#include <sys/bus.h>
-
-#include <dev/isa/isavar.h>
-#include <dev/isa/isadmavar.h>
-
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/ic/atppcvar.h>
+
+#include <dev/isa/isadmavar.h>
#include <dev/isa/atppc_isadma.h>
static int atppc_acpi_match(device_t, cfdata_t, void *);
Index: src/sys/dev/acpi/attimer_acpi.c
diff -u src/sys/dev/acpi/attimer_acpi.c:1.13 src/sys/dev/acpi/attimer_acpi.c:1.14
--- src/sys/dev/acpi/attimer_acpi.c:1.13 Tue Apr 7 17:59:18 2009
+++ src/sys/dev/acpi/attimer_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: attimer_acpi.c,v 1.13 2009/04/07 17:59:18 dyoung Exp $ */
+/* $NetBSD: attimer_acpi.c,v 1.14 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -59,19 +59,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: attimer_acpi.c,v 1.13 2009/04/07 17:59:18 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: attimer_acpi.c,v 1.14 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
#include <sys/device.h>
-#include <sys/proc.h>
-
-#include <sys/bus.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/ic/attimervar.h>
Index: src/sys/dev/acpi/com_acpi.c
diff -u src/sys/dev/acpi/com_acpi.c:1.30 src/sys/dev/acpi/com_acpi.c:1.31
--- src/sys/dev/acpi/com_acpi.c:1.30 Thu Nov 12 20:30:10 2009
+++ src/sys/dev/acpi/com_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: com_acpi.c,v 1.30 2009/11/12 20:30:10 dyoung Exp $ */
+/* $NetBSD: com_acpi.c,v 1.31 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,28 +26,19 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.30 2009/11/12 20:30:10 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.31 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
+#include <sys/systm.h>
#include <sys/termios.h>
-#include <sys/bus.h>
-
-#include <dev/isa/isavar.h>
-#include <dev/isa/isadmavar.h>
-
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/ic/comvar.h>
+#include <dev/isa/isadmavar.h>
+
static int com_acpi_match(device_t, cfdata_t , void *);
static void com_acpi_attach(device_t, device_t, void *);
Index: src/sys/dev/acpi/fdc_acpi.c
diff -u src/sys/dev/acpi/fdc_acpi.c:1.37 src/sys/dev/acpi/fdc_acpi.c:1.38
--- src/sys/dev/acpi/fdc_acpi.c:1.37 Tue Mar 2 18:44:47 2010
+++ src/sys/dev/acpi/fdc_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpi.c,v 1.37 2010/03/02 18:44:47 jruoho Exp $ */
+/* $NetBSD: fdc_acpi.c,v 1.38 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,32 +31,21 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.37 2010/03/02 18:44:47 jruoho Exp $");
-
-#include "rnd.h"
+__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.38 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/callout.h>
#include <sys/device.h>
-#include <sys/buf.h>
-#include <sys/bufq.h>
-#include <sys/queue.h>
#include <sys/disk.h>
+#include <sys/systm.h>
+
#if NRND > 0
#include <sys/rnd.h>
#endif
-#include <sys/bus.h>
-#include <sys/intr.h>
-
-#include <dev/isa/isavar.h>
-#include <dev/isa/isadmavar.h>
-
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
+#include <dev/isa/isadmavar.h>
#include <dev/isa/fdcvar.h>
#include <dev/isa/fdvar.h>
#include <dev/isa/fdreg.h>
Index: src/sys/dev/acpi/hpet_acpi.c
diff -u src/sys/dev/acpi/hpet_acpi.c:1.4 src/sys/dev/acpi/hpet_acpi.c:1.5
--- src/sys/dev/acpi/hpet_acpi.c:1.4 Tue Feb 17 12:46:01 2009
+++ src/sys/dev/acpi/hpet_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hpet_acpi.c,v 1.4 2009/02/17 12:46:01 jmcneill Exp $ */
+/* $NetBSD: hpet_acpi.c,v 1.5 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2006 Nicolas Joly
@@ -29,22 +29,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpet_acpi.c,v 1.4 2009/02/17 12:46:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpet_acpi.c,v 1.5 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/errno.h>
#include <sys/device.h>
-
-#include <sys/bus.h>
-
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpireg.h>
-#include <dev/acpi/acpivar.h>
-
+#include <sys/systm.h>
#include <sys/time.h>
#include <sys/timetc.h>
+#include <dev/acpi/acpivar.h>
+
#include <dev/ic/hpetvar.h>
static int hpet_acpi_match(device_t, cfdata_t, void *);
Index: src/sys/dev/acpi/hpqlb_acpi.c
diff -u src/sys/dev/acpi/hpqlb_acpi.c:1.6 src/sys/dev/acpi/hpqlb_acpi.c:1.7
--- src/sys/dev/acpi/hpqlb_acpi.c:1.6 Wed Feb 24 22:37:56 2010
+++ src/sys/dev/acpi/hpqlb_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hpqlb_acpi.c,v 1.6 2010/02/24 22:37:56 dyoung Exp $ */
+/* $NetBSD: hpqlb_acpi.c,v 1.7 2010/03/05 14:00:17 jruoho Exp $ */
/*-
* Copyright (c) 2008 Christoph Egger <ceg...@netbsd.org>
@@ -27,24 +27,21 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpqlb_acpi.c,v 1.6 2010/02/24 22:37:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpqlb_acpi.c,v 1.7 2010/03/05 14:00:17 jruoho Exp $");
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/malloc.h>
-#include <sys/buf.h>
-#include <sys/callout.h>
-#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/pmf.h>
+#include <sys/systm.h>
+
+#include <machine/pio.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
-#include <machine/pio.h>
+#include <dev/isa/isareg.h>
+
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wskbdvar.h>
-#include <dev/isa/isareg.h>
#define _COMPONENT ACPI_RESOURCE_COMPONENT
ACPI_MODULE_NAME ("hpqlb_acpi")
Index: src/sys/dev/acpi/joy_acpi.c
diff -u src/sys/dev/acpi/joy_acpi.c:1.9 src/sys/dev/acpi/joy_acpi.c:1.10
--- src/sys/dev/acpi/joy_acpi.c:1.9 Tue Feb 17 12:46:01 2009
+++ src/sys/dev/acpi/joy_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_acpi.c,v 1.9 2009/02/17 12:46:01 jmcneill Exp $ */
+/* $NetBSD: joy_acpi.c,v 1.10 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,19 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_acpi.c,v 1.9 2009/02/17 12:46:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_acpi.c,v 1.10 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
#include <sys/device.h>
-#include <sys/proc.h>
-
-#include <sys/bus.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/ic/joyvar.h>
Index: src/sys/dev/acpi/mpu_acpi.c
diff -u src/sys/dev/acpi/mpu_acpi.c:1.9 src/sys/dev/acpi/mpu_acpi.c:1.10
--- src/sys/dev/acpi/mpu_acpi.c:1.9 Tue Feb 17 12:46:01 2009
+++ src/sys/dev/acpi/mpu_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_acpi.c,v 1.9 2009/02/17 12:46:01 jmcneill Exp $ */
+/* $NetBSD: mpu_acpi.c,v 1.10 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,27 +30,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.9 2009/02/17 12:46:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.10 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
-
-#include <sys/bus.h>
-
-#include <dev/isa/isavar.h>
-#include <dev/isa/isadmavar.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/ic/mpuvar.h>
+#include <dev/isa/isadmavar.h>
+
static int mpu_acpi_match(device_t, cfdata_t, void *);
static void mpu_acpi_attach(device_t, device_t, void *);
Index: src/sys/dev/acpi/lpt_acpi.c
diff -u src/sys/dev/acpi/lpt_acpi.c:1.18 src/sys/dev/acpi/lpt_acpi.c:1.19
--- src/sys/dev/acpi/lpt_acpi.c:1.18 Tue Feb 17 12:46:01 2009
+++ src/sys/dev/acpi/lpt_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_acpi.c,v 1.18 2009/02/17 12:46:01 jmcneill Exp $ */
+/* $NetBSD: lpt_acpi.c,v 1.19 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,28 +26,19 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.18 2009/02/17 12:46:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.19 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/termios.h>
+#include <sys/systm.h>
-#include <sys/bus.h>
-
-#include <dev/isa/isavar.h>
-#include <dev/isa/isadmavar.h>
-
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/ic/lptvar.h>
+#include <dev/isa/isadmavar.h>
+
static int lpt_acpi_match(device_t, cfdata_t, void *);
static void lpt_acpi_attach(device_t, device_t, void *);
Index: src/sys/dev/acpi/pckbc_acpi.c
diff -u src/sys/dev/acpi/pckbc_acpi.c:1.32 src/sys/dev/acpi/pckbc_acpi.c:1.33
--- src/sys/dev/acpi/pckbc_acpi.c:1.32 Sat Aug 29 19:17:44 2009
+++ src/sys/dev/acpi/pckbc_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_acpi.c,v 1.32 2009/08/29 19:17:44 jmcneill Exp $ */
+/* $NetBSD: pckbc_acpi.c,v 1.33 2010/03/05 14:00:17 jruoho Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,26 +42,21 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.32 2009/08/29 19:17:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.33 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
+#include <sys/callout.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/errno.h>
-#include <sys/queue.h>
-#include <sys/bus.h>
+#include <sys/systm.h>
+
+#include <dev/acpi/acpivar.h>
#include <dev/isa/isareg.h>
-#include <dev/isa/isavar.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
-#include <dev/acpi/acpivar.h>
-
static int pckbc_acpi_match(device_t, cfdata_t, void *);
static void pckbc_acpi_attach(device_t, device_t, void *);
Index: src/sys/dev/acpi/pcppi_acpi.c
diff -u src/sys/dev/acpi/pcppi_acpi.c:1.11 src/sys/dev/acpi/pcppi_acpi.c:1.12
--- src/sys/dev/acpi/pcppi_acpi.c:1.11 Tue Feb 17 12:46:01 2009
+++ src/sys/dev/acpi/pcppi_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pcppi_acpi.c,v 1.11 2009/02/17 12:46:01 jmcneill Exp $ */
+/* $NetBSD: pcppi_acpi.c,v 1.12 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,19 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcppi_acpi.c,v 1.11 2009/02/17 12:46:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcppi_acpi.c,v 1.12 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
#include <sys/device.h>
-#include <sys/proc.h>
-#include <sys/bus.h>
-
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/isa/pcppivar.h>
Index: src/sys/dev/acpi/spic_acpi.c
diff -u src/sys/dev/acpi/spic_acpi.c:1.5 src/sys/dev/acpi/spic_acpi.c:1.6
--- src/sys/dev/acpi/spic_acpi.c:1.5 Sat Jan 30 18:35:49 2010
+++ src/sys/dev/acpi/spic_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: spic_acpi.c,v 1.5 2010/01/30 18:35:49 jruoho Exp $ */
+/* $NetBSD: spic_acpi.c,v 1.6 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,22 +30,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spic_acpi.c,v 1.5 2010/01/30 18:35:49 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spic_acpi.c,v 1.6 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/proc.h>
-#include <sys/kernel.h>
-#include <sys/callout.h>
-#include <sys/bus.h>
-
-#include <dev/ic/spicvar.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
+#include <dev/ic/spicvar.h>
+
#define _COMPONENT ACPI_RESOURCE_COMPONENT
ACPI_MODULE_NAME ("spic_acpi")
Index: src/sys/dev/acpi/ug_acpi.c
diff -u src/sys/dev/acpi/ug_acpi.c:1.5 src/sys/dev/acpi/ug_acpi.c:1.6
--- src/sys/dev/acpi/ug_acpi.c:1.5 Tue Feb 17 12:46:01 2009
+++ src/sys/dev/acpi/ug_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ug_acpi.c,v 1.5 2009/02/17 12:46:01 jmcneill Exp $ */
+/* $NetBSD: ug_acpi.c,v 1.6 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2007 Mihai Chelaru <kef...@netbsd.ro>
@@ -26,25 +26,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ug_acpi.c,v 1.5 2009/02/17 12:46:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ug_acpi.c,v 1.6 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
-#include <sys/envsys.h>
-
-#include <sys/bus.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
-#include <dev/sysmon/sysmonvar.h>
-
#include <dev/ic/ugreg.h>
#include <dev/ic/ugvar.h>
Index: src/sys/dev/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.27 src/sys/dev/acpi/thinkpad_acpi.c:1.28
--- src/sys/dev/acpi/thinkpad_acpi.c:1.27 Sun Feb 28 17:22:41 2010
+++ src/sys/dev/acpi/thinkpad_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.27 2010/02/28 17:22:41 jruoho Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.28 2010/03/05 14:00:17 jruoho Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,19 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.27 2010/02/28 17:22:41 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.28 2010/03/05 14:00:17 jruoho Exp $");
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/buf.h>
-#include <sys/callout.h>
-#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/pmf.h>
-#include <sys/queue.h>
-#include <sys/kmem.h>
+#include <sys/module.h>
+#include <sys/systm.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
Index: src/sys/dev/acpi/wb_acpi.c
diff -u src/sys/dev/acpi/wb_acpi.c:1.1 src/sys/dev/acpi/wb_acpi.c:1.2
--- src/sys/dev/acpi/wb_acpi.c:1.1 Wed Sep 30 20:44:50 2009
+++ src/sys/dev/acpi/wb_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wb_acpi.c,v 1.1 2009/09/30 20:44:50 jmcneill Exp $ */
+/* $NetBSD: wb_acpi.c,v 1.2 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2009 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,29 +26,21 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wb_acpi.c,v 1.1 2009/09/30 20:44:50 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wb_acpi.c,v 1.2 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/proc.h>
-
-#include <sys/bus.h>
-
-#include <dev/isa/isavar.h>
-#include <dev/isa/isadmavar.h>
+#include <sys/systm.h>
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
-#include <dev/sdmmc/sdmmcvar.h>
#include <dev/ic/w83l518dvar.h>
#include <dev/ic/w83l518dreg.h>
+#include <dev/isa/isadmavar.h>
+
+#include <dev/sdmmc/sdmmcvar.h>
+
static int wb_acpi_match(device_t, cfdata_t, void *);
static void wb_acpi_attach(device_t, device_t, void *);
static int wb_acpi_detach(device_t, int);
Index: src/sys/dev/acpi/wss_acpi.c
diff -u src/sys/dev/acpi/wss_acpi.c:1.25 src/sys/dev/acpi/wss_acpi.c:1.26
--- src/sys/dev/acpi/wss_acpi.c:1.25 Tue Aug 18 21:33:29 2009
+++ src/sys/dev/acpi/wss_acpi.c Fri Mar 5 14:00:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_acpi.c,v 1.25 2009/08/18 21:33:29 cegger Exp $ */
+/* $NetBSD: wss_acpi.c,v 1.26 2010/03/05 14:00:17 jruoho Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,28 +26,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.25 2009/08/18 21:33:29 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.26 2010/03/05 14:00:17 jruoho Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/syslog.h>
+#include <sys/audioio.h>
#include <sys/device.h>
-#include <sys/proc.h>
-
-#include <sys/bus.h>
+#include <sys/systm.h>
-#include <sys/audioio.h>
#include <dev/audio_if.h>
-#include <dev/isa/isavar.h>
-#include <dev/isa/isadmavar.h>
-
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
+#include <dev/isa/isadmavar.h>
#include <dev/isa/ad1848var.h>
#include <dev/isa/wssreg.h>
#include <dev/isa/wssvar.h>
