[src/trunk]: src/sys/dev/acpi Fix ACPI_DEBUG build failures reported by Greg ...

[jruoho <jruoho%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1f9605f0d261
branches:  trunk
changeset: 752708:1f9605f0d261
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Thu Mar 04 20:17:30 2010 +0000

description:
Fix ACPI_DEBUG build failures reported by Greg A. Woods.

diffstat:

 sys/dev/acpi/acpi.c       |  12 ++++++------
 sys/dev/acpi/atk0110.c    |   8 ++++----
 sys/dev/acpi/smbus_acpi.c |  10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diffs (100 lines):

diff -r c77336cf55e9 -r 1f9605f0d261 sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c       Thu Mar 04 18:49:14 2010 +0000
+++ b/sys/dev/acpi/acpi.c       Thu Mar 04 20:17:30 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi.c,v 1.152 2010/03/03 06:57:05 jruoho Exp $        */
+/*     $NetBSD: acpi.c,v 1.153 2010/03/04 20:17:30 jruoho Exp $        */
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.152 2010/03/03 06:57:05 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.153 2010/03/04 20:17:30 jruoho Exp $");
 
 #include "opt_acpi.h"
 #include "opt_pcifixup.h"
@@ -822,8 +822,8 @@
        ACPI_DEVICE_INFO *newdi;
 
 #ifdef ACPI_DEBUG
-       aprint_normal("acpi_activate_device: %s, old status=%x\n",
-              (*di)->HardwareId.Value, (*di)->CurrentStatus);
+       aprint_normal("%s: %s, old status=%x\n", __func__,
+              (*di)->HardwareId.String, (*di)->CurrentStatus);
 #endif
 
        rv = acpi_allocate_resources(handle);
@@ -840,8 +840,8 @@
        *di = newdi;
 
 #ifdef ACPI_DEBUG
-       aprint_normal("acpi_activate_device: %s, new status=%x\n",
-              (*di)->HardwareId.Value, (*di)->CurrentStatus);
+       aprint_normal("%s: %s, new status=%x\n", __func__,
+              (*di)->HardwareId.String, (*di)->CurrentStatus);
 #endif
 }
 #endif /* ACPI_ACTIVATE_DEV */
diff -r c77336cf55e9 -r 1f9605f0d261 sys/dev/acpi/atk0110.c
--- a/sys/dev/acpi/atk0110.c    Thu Mar 04 18:49:14 2010 +0000
+++ b/sys/dev/acpi/atk0110.c    Thu Mar 04 20:17:30 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atk0110.c,v 1.7 2010/03/04 08:44:55 jruoho Exp $       */
+/*     $NetBSD: atk0110.c,v 1.8 2010/03/04 20:17:30 jruoho Exp $       */
 /*     $OpenBSD: atk0110.c,v 1.1 2009/07/23 01:38:16 cnst Exp $        */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.7 2010/03/04 08:44:55 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.8 2010/03/04 20:17:30 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -27,8 +27,8 @@
 
 #include <dev/sysmon/sysmonvar.h>
 
-#include "acpi.h"
-#include "acpivar.h"
+#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
 
 /*
  * ASUSTeK AI Booster (ACPI ASOC ATK0110).
diff -r c77336cf55e9 -r 1f9605f0d261 sys/dev/acpi/smbus_acpi.c
--- a/sys/dev/acpi/smbus_acpi.c Thu Mar 04 18:49:14 2010 +0000
+++ b/sys/dev/acpi/smbus_acpi.c Thu Mar 04 20:17:30 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: smbus_acpi.c,v 1.6 2010/03/04 13:11:14 pgoyette Exp $ */
+/* $NetBSD: smbus_acpi.c,v 1.7 2010/03/04 20:17:30 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -36,10 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbus_acpi.c,v 1.6 2010/03/04 13:11:14 pgoyette Exp $");
-
-#define _COMPONENT             ACPI_BUS_COMPONENT
-ACPI_MODULE_NAME               ("smbus_acpi")
+__KERNEL_RCSID(0, "$NetBSD: smbus_acpi.c,v 1.7 2010/03/04 20:17:30 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -58,6 +55,9 @@
 
 #include <dev/i2c/i2cvar.h>
 
+#define _COMPONENT             ACPI_BUS_COMPONENT
+ACPI_MODULE_NAME               ("smbus_acpi")
+
 /*
  * ACPI SMBus CMI protocol codes
  */