Module Name: src
Committed By: dyoung
Date: Mon May 30 01:15:30 UTC 2011
Modified Files:
src/usr.sbin/acpitools/aml: aml_common.c aml_parse.c aml_region.c
Log Message:
It's not necessary to #include both <machine/bus.h> and <sys/bus.h>,
because <sys/bus.h> will do: <sys/bus.h> #includes <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_common.c
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/acpitools/aml/aml_parse.c \
src/usr.sbin/acpitools/aml/aml_region.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/acpitools/aml/aml_common.c
diff -u src/usr.sbin/acpitools/aml/aml_common.c:1.2 src/usr.sbin/acpitools/aml/aml_common.c:1.3
--- src/usr.sbin/acpitools/aml/aml_common.c:1.2 Sun Jan 18 09:46:59 2009
+++ src/usr.sbin/acpitools/aml/aml_common.c Mon May 30 01:15:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aml_common.c,v 1.2 2009/01/18 09:46:59 lukem Exp $ */
+/* $NetBSD: aml_common.c,v 1.3 2011/05/30 01:15:30 dyoung Exp $ */
/*-
* Copyright (c) 1999 Takanori Watanabe
@@ -30,7 +30,7 @@
* $FreeBSD: src/usr.sbin/acpi/amldb/aml/aml_common.c,v 1.6 2000/11/09 06:24:45 iwasaki Exp $
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: aml_common.c,v 1.2 2009/01/18 09:46:59 lukem Exp $");
+__RCSID("$NetBSD: aml_common.c,v 1.3 2011/05/30 01:15:30 dyoung Exp $");
#include <sys/param.h>
@@ -47,7 +47,6 @@
#include <sys/sysctl.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <machine/bus.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#ifndef ACPI_NO_OSDFUNC_INLINE
Index: src/usr.sbin/acpitools/aml/aml_parse.c
diff -u src/usr.sbin/acpitools/aml/aml_parse.c:1.1 src/usr.sbin/acpitools/aml/aml_parse.c:1.2
--- src/usr.sbin/acpitools/aml/aml_parse.c:1.1 Sun Jan 14 04:36:13 2007
+++ src/usr.sbin/acpitools/aml/aml_parse.c Mon May 30 01:15:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aml_parse.c,v 1.1 2007/01/14 04:36:13 christos Exp $ */
+/* $NetBSD: aml_parse.c,v 1.2 2011/05/30 01:15:30 dyoung Exp $ */
/*-
* Copyright (c) 1999 Doug Rabson
@@ -30,7 +30,7 @@
* $FreeBSD: src/usr.sbin/acpi/amldb/aml/aml_parse.c,v 1.7 2001/10/23 14:54:15 takawata Exp $
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: aml_parse.c,v 1.1 2007/01/14 04:36:13 christos Exp $");
+__RCSID("$NetBSD: aml_parse.c,v 1.2 2011/05/30 01:15:30 dyoung Exp $");
#include <sys/param.h>
@@ -61,7 +61,6 @@
#else /* _KERNEL */
#include <sys/systm.h>
#include <sys/bus.h>
-#include <machine/bus.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#ifndef ACPI_NO_OSDFUNC_INLINE
Index: src/usr.sbin/acpitools/aml/aml_region.c
diff -u src/usr.sbin/acpitools/aml/aml_region.c:1.1 src/usr.sbin/acpitools/aml/aml_region.c:1.2
--- src/usr.sbin/acpitools/aml/aml_region.c:1.1 Sun Jan 14 04:36:13 2007
+++ src/usr.sbin/acpitools/aml/aml_region.c Mon May 30 01:15:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aml_region.c,v 1.1 2007/01/14 04:36:13 christos Exp $ */
+/* $NetBSD: aml_region.c,v 1.2 2011/05/30 01:15:30 dyoung Exp $ */
/*-
* Copyright (c) 2000 Mitsuru IWASAKI <[email protected]>
@@ -30,7 +30,7 @@
* $FreeBSD: src/usr.sbin/acpi/amldb/aml/aml_region.c,v 1.5 2000/11/09 06:24:45 iwasaki Exp $
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: aml_region.c,v 1.1 2007/01/14 04:36:13 christos Exp $");
+__RCSID("$NetBSD: aml_region.c,v 1.2 2011/05/30 01:15:30 dyoung Exp $");
/*
* Region I/O subroutine
@@ -41,7 +41,6 @@
#include <sys/systm.h>
#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
