Module Name: src
Committed By: snj
Date: Fri May 1 01:38:17 UTC 2009
Modified Files:
src/sys/dev/acpi [netbsd-5]: acpi_ec.c acpi_resource.c atppc_acpi.c
attimer_acpi.c com_acpi.c fdc_acpi.c hpet_acpi.c joy_acpi.c
lpt_acpi.c mpu_acpi.c pckbc_acpi.c pcppi_acpi.c ug_acpi.c
wss_acpi.c ym_acpi.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #498):
sys/dev/acpi/acpi_ec.c: revision 1.53
sys/dev/acpi/acpi_resource.c: revision 1.27
sys/dev/acpi/atppc_acpi.c: revision 1.16
sys/dev/acpi/attimer_acpi.c: revision 1.12
sys/dev/acpi/com_acpi.c: revision 1.28
sys/dev/acpi/fdc_acpi.c: revision 1.35
sys/dev/acpi/hpet_acpi.c: revision 1.4
sys/dev/acpi/joy_acpi.c: revision 1.9
sys/dev/acpi/lpt_acpi.c: revision 1.18
sys/dev/acpi/mpu_acpi.c: revision 1.9
sys/dev/acpi/pckbc_acpi.c: revision 1.31
sys/dev/acpi/pcppi_acpi.c: revision 1.11
sys/dev/acpi/ug_acpi.c: revision 1.5
sys/dev/acpi/wss_acpi.c: revision 1.20
sys/dev/acpi/ym_acpi.c: revision 1.6
Cut the amount of spam from acpi devices in roughly half by printing
resources on the same line as autoconf messages. Things like:
pcppi1 at acpi0 (SPKR, PNP0800)
pcppi1: io 0x61
become:
pcppi1 at acpi0 (SPKR, PNP0800): io 0x61
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.52.8.1 src/sys/dev/acpi/acpi_ec.c
cvs rdiff -u -r1.26 -r1.26.14.1 src/sys/dev/acpi/acpi_resource.c
cvs rdiff -u -r1.14.10.1 -r1.14.10.2 src/sys/dev/acpi/atppc_acpi.c
cvs rdiff -u -r1.11 -r1.11.10.1 src/sys/dev/acpi/attimer_acpi.c
cvs rdiff -u -r1.27 -r1.27.14.1 src/sys/dev/acpi/com_acpi.c
cvs rdiff -u -r1.34 -r1.34.14.1 src/sys/dev/acpi/fdc_acpi.c
cvs rdiff -u -r1.3 -r1.3.14.1 src/sys/dev/acpi/hpet_acpi.c
cvs rdiff -u -r1.8 -r1.8.14.1 src/sys/dev/acpi/joy_acpi.c \
src/sys/dev/acpi/mpu_acpi.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/dev/acpi/lpt_acpi.c
cvs rdiff -u -r1.30 -r1.30.4.1 src/sys/dev/acpi/pckbc_acpi.c
cvs rdiff -u -r1.10 -r1.10.14.1 src/sys/dev/acpi/pcppi_acpi.c
cvs rdiff -u -r1.4 -r1.4.14.1 src/sys/dev/acpi/ug_acpi.c
cvs rdiff -u -r1.19 -r1.19.14.1 src/sys/dev/acpi/wss_acpi.c
cvs rdiff -u -r1.5 -r1.5.14.1 src/sys/dev/acpi/ym_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_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.52 src/sys/dev/acpi/acpi_ec.c:1.52.8.1
--- src/sys/dev/acpi/acpi_ec.c:1.52 Tue Jun 3 15:12:39 2008
+++ src/sys/dev/acpi/acpi_ec.c Fri May 1 01:38:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.52 2008/06/03 15:12:39 joerg Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.52.8.1 2009/05/01 01:38:16 snj Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.52 2008/06/03 15:12:39 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.52.8.1 2009/05/01 01:38:16 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -228,7 +228,7 @@
if (!acpiecdt_find(parent, &ec_handle, &cmd_reg, &data_reg, &gpebit))
panic("ECDT disappeared");
- aprint_naive(": ACPI Embedded Controller via ECDT\n");
+ aprint_naive("\n");
aprint_normal(": ACPI Embedded Controller via ECDT\n");
acpiec_common_attach(parent, self, ec_handle, cmd_reg, data_reg,
@@ -257,16 +257,13 @@
ACPI_STATUS rv;
if (ec_singleton != NULL) {
- aprint_naive(": ACPI Embedded Controller (disabled)\n");
+ aprint_naive(": (disabled)\n");
aprint_normal(": ACPI Embedded Controller (disabled)\n");
if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, "couldn't establish power handler\n");
return;
}
- aprint_naive(": ACPI Embedded Controller\n");
- aprint_normal(": ACPI Embedded Controller\n");
-
if (!acpiec_parse_gpe_package(self, aa->aa_node->ad_handle,
&gpe_handle, &gpebit))
return;
Index: src/sys/dev/acpi/acpi_resource.c
diff -u src/sys/dev/acpi/acpi_resource.c:1.26 src/sys/dev/acpi/acpi_resource.c:1.26.14.1
--- src/sys/dev/acpi/acpi_resource.c:1.26 Mon Apr 7 10:16:59 2008
+++ src/sys/dev/acpi/acpi_resource.c Fri May 1 01:38:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_resource.c,v 1.26 2008/04/07 10:16:59 jmcneill Exp $ */
+/* $NetBSD: acpi_resource.c,v 1.26.14.1 2009/05/01 01:38:16 snj Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.26 2008/04/07 10:16:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.26.14.1 2009/05/01 01:38:16 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -381,7 +381,7 @@
SIMPLEQ_EMPTY(&res->ar_drq))
return;
- aprint_normal("%s:", device_xname(dev));
+ aprint_normal(":");
if (SIMPLEQ_EMPTY(&res->ar_io) == 0) {
struct acpi_io *ar;
@@ -438,6 +438,7 @@
}
aprint_normal("\n");
+ aprint_naive("\n");
}
/*
Index: src/sys/dev/acpi/atppc_acpi.c
diff -u src/sys/dev/acpi/atppc_acpi.c:1.14.10.1 src/sys/dev/acpi/atppc_acpi.c:1.14.10.2
--- src/sys/dev/acpi/atppc_acpi.c:1.14.10.1 Thu Nov 20 03:18:16 2008
+++ src/sys/dev/acpi/atppc_acpi.c Fri May 1 01:38:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_acpi.c,v 1.14.10.1 2008/11/20 03:18:16 snj Exp $ */
+/* $NetBSD: atppc_acpi.c,v 1.14.10.2 2009/05/01 01:38:16 snj Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.14.10.1 2008/11/20 03:18:16 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.14.10.2 2009/05/01 01:38:16 snj Exp $");
#include "opt_atppc.h"
@@ -114,9 +114,6 @@
sc->sc_dev_ok = ATPPC_NOATTACH;
- aprint_naive(": AT Parallel Port\n");
- aprint_normal(": AT Parallel Port\n");
-
sc->sc_dev = self;
/* parse resources */
Index: src/sys/dev/acpi/attimer_acpi.c
diff -u src/sys/dev/acpi/attimer_acpi.c:1.11 src/sys/dev/acpi/attimer_acpi.c:1.11.10.1
--- src/sys/dev/acpi/attimer_acpi.c:1.11 Mon Apr 28 20:23:47 2008
+++ src/sys/dev/acpi/attimer_acpi.c Fri May 1 01:38:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: attimer_acpi.c,v 1.11 2008/04/28 20:23:47 martin Exp $ */
+/* $NetBSD: attimer_acpi.c,v 1.11.10.1 2009/05/01 01:38:16 snj Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: attimer_acpi.c,v 1.11 2008/04/28 20:23:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: attimer_acpi.c,v 1.11.10.1 2009/05/01 01:38:16 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,9 +119,6 @@
sc->sc_dev = self;
- aprint_naive(": AT Timer\n");
- aprint_normal(": AT Timer\n");
-
/* parse resources */
rv = acpi_resource_parse(sc->sc_dev, aa->aa_node->ad_handle, "_CRS",
&res, &acpi_resource_parse_ops_default);
Index: src/sys/dev/acpi/com_acpi.c
diff -u src/sys/dev/acpi/com_acpi.c:1.27 src/sys/dev/acpi/com_acpi.c:1.27.14.1
--- src/sys/dev/acpi/com_acpi.c:1.27 Fri Mar 14 15:09:11 2008
+++ src/sys/dev/acpi/com_acpi.c Fri May 1 01:38:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: com_acpi.c,v 1.27 2008/03/14 15:09:11 cube Exp $ */
+/* $NetBSD: com_acpi.c,v 1.27.14.1 2009/05/01 01:38:16 snj Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.27 2008/03/14 15:09:11 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.27.14.1 2009/05/01 01:38:16 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,9 +104,6 @@
bus_space_handle_t ioh;
ACPI_STATUS rv;
- aprint_naive("\n");
- aprint_normal("\n");
-
sc->sc_dev = self;
/* parse resources */
Index: src/sys/dev/acpi/fdc_acpi.c
diff -u src/sys/dev/acpi/fdc_acpi.c:1.34 src/sys/dev/acpi/fdc_acpi.c:1.34.14.1
--- src/sys/dev/acpi/fdc_acpi.c:1.34 Sun Mar 16 13:58:22 2008
+++ src/sys/dev/acpi/fdc_acpi.c Fri May 1 01:38:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpi.c,v 1.34 2008/03/16 13:58:22 yamt Exp $ */
+/* $NetBSD: fdc_acpi.c,v 1.34.14.1 2009/05/01 01:38:16 snj Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.34 2008/03/16 13:58:22 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.34.14.1 2009/05/01 01:38:16 snj Exp $");
#include "rnd.h"
@@ -118,9 +118,6 @@
struct acpi_resources res;
ACPI_STATUS rv;
- aprint_naive("\n");
- aprint_normal("\n");
-
sc->sc_dev = self;
sc->sc_ic = aa->aa_ic;
asc->sc_node = aa->aa_node;
Index: src/sys/dev/acpi/hpet_acpi.c
diff -u src/sys/dev/acpi/hpet_acpi.c:1.3 src/sys/dev/acpi/hpet_acpi.c:1.3.14.1
--- src/sys/dev/acpi/hpet_acpi.c:1.3 Fri Mar 21 13:28:14 2008
+++ src/sys/dev/acpi/hpet_acpi.c Fri May 1 01:38:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hpet_acpi.c,v 1.3 2008/03/21 13:28:14 xtraeme Exp $ */
+/* $NetBSD: hpet_acpi.c,v 1.3.14.1 2009/05/01 01:38:16 snj Exp $ */
/*
* Copyright (c) 2006 Nicolas Joly
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpet_acpi.c,v 1.3 2008/03/21 13:28:14 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpet_acpi.c,v 1.3.14.1 2009/05/01 01:38:16 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,9 +86,6 @@
struct acpi_mem *mem;
ACPI_STATUS rv;
- aprint_naive("\n");
- aprint_normal("\n");
-
/* parse resources */
rv = acpi_resource_parse(self, aa->aa_node->ad_handle, "_CRS",
&res, &acpi_resource_parse_ops_default);
Index: src/sys/dev/acpi/joy_acpi.c
diff -u src/sys/dev/acpi/joy_acpi.c:1.8 src/sys/dev/acpi/joy_acpi.c:1.8.14.1
--- src/sys/dev/acpi/joy_acpi.c:1.8 Wed Mar 26 18:27:07 2008
+++ src/sys/dev/acpi/joy_acpi.c Fri May 1 01:38:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_acpi.c,v 1.8 2008/03/26 18:27:07 xtraeme Exp $ */
+/* $NetBSD: joy_acpi.c,v 1.8.14.1 2009/05/01 01:38:16 snj Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_acpi.c,v 1.8 2008/03/26 18:27:07 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_acpi.c,v 1.8.14.1 2009/05/01 01:38:16 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,9 +93,6 @@
struct acpi_io *io;
ACPI_STATUS rv;
- aprint_naive("\n");
- aprint_normal("\n");
-
sc->sc_dev = self;
/* parse resources */
Index: src/sys/dev/acpi/mpu_acpi.c
diff -u src/sys/dev/acpi/mpu_acpi.c:1.8 src/sys/dev/acpi/mpu_acpi.c:1.8.14.1
--- src/sys/dev/acpi/mpu_acpi.c:1.8 Thu Mar 27 10:22:00 2008
+++ src/sys/dev/acpi/mpu_acpi.c Fri May 1 01:38:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_acpi.c,v 1.8 2008/03/27 10:22:00 xtraeme Exp $ */
+/* $NetBSD: mpu_acpi.c,v 1.8.14.1 2009/05/01 01:38:17 snj Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.8 2008/03/27 10:22:00 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.8.14.1 2009/05/01 01:38:17 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,9 +98,6 @@
struct acpi_irq *irq;
ACPI_STATUS rv;
- aprint_naive("\n");
- aprint_normal("\n");
-
/* parse resources */
rv = acpi_resource_parse(self, aa->aa_node->ad_handle, "_CRS",
&res, &acpi_resource_parse_ops_default);
Index: src/sys/dev/acpi/lpt_acpi.c
diff -u src/sys/dev/acpi/lpt_acpi.c:1.17 src/sys/dev/acpi/lpt_acpi.c:1.17.8.1
--- src/sys/dev/acpi/lpt_acpi.c:1.17 Sat May 31 14:07:03 2008
+++ src/sys/dev/acpi/lpt_acpi.c Fri May 1 01:38:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_acpi.c,v 1.17 2008/05/31 14:07:03 jmcneill Exp $ */
+/* $NetBSD: lpt_acpi.c,v 1.17.8.1 2009/05/01 01:38:16 snj Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.17 2008/05/31 14:07:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.17.8.1 2009/05/01 01:38:16 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,9 +95,6 @@
struct acpi_irq *irq;
ACPI_STATUS rv;
- aprint_naive("\n");
- aprint_normal("\n");
-
sc->sc_dev = self;
if (!pmf_device_register(self, NULL, NULL))
Index: src/sys/dev/acpi/pckbc_acpi.c
diff -u src/sys/dev/acpi/pckbc_acpi.c:1.30 src/sys/dev/acpi/pckbc_acpi.c:1.30.4.1
--- src/sys/dev/acpi/pckbc_acpi.c:1.30 Tue Sep 16 11:24:55 2008
+++ src/sys/dev/acpi/pckbc_acpi.c Fri May 1 01:38:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_acpi.c,v 1.30 2008/09/16 11:24:55 pgoyette Exp $ */
+/* $NetBSD: pckbc_acpi.c,v 1.30.4.1 2009/05/01 01:38:17 snj Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.30 2008/09/16 11:24:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.30.4.1 2009/05/01 01:38:17 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -155,8 +155,7 @@
panic("pckbc_acpi_attach: impossible");
}
- aprint_naive("\n");
- aprint_normal(": %s port\n", pckbc_slot_names[psc->sc_slot]);
+ aprint_normal(" (%s port)", pckbc_slot_names[psc->sc_slot]);
/* parse resources */
rv = acpi_resource_parse(sc->sc_dv, aa->aa_node->ad_handle, "_CRS",
Index: src/sys/dev/acpi/pcppi_acpi.c
diff -u src/sys/dev/acpi/pcppi_acpi.c:1.10 src/sys/dev/acpi/pcppi_acpi.c:1.10.14.1
--- src/sys/dev/acpi/pcppi_acpi.c:1.10 Tue Mar 4 16:35:18 2008
+++ src/sys/dev/acpi/pcppi_acpi.c Fri May 1 01:38:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pcppi_acpi.c,v 1.10 2008/03/04 16:35:18 cube Exp $ */
+/* $NetBSD: pcppi_acpi.c,v 1.10.14.1 2009/05/01 01:38:17 snj Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcppi_acpi.c,v 1.10 2008/03/04 16:35:18 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcppi_acpi.c,v 1.10.14.1 2009/05/01 01:38:17 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,9 +93,6 @@
struct acpi_io *io;
ACPI_STATUS rv;
- aprint_naive("\n");
- aprint_normal("\n");
-
sc->sc_dv = self;
/* parse resources */
Index: src/sys/dev/acpi/ug_acpi.c
diff -u src/sys/dev/acpi/ug_acpi.c:1.4 src/sys/dev/acpi/ug_acpi.c:1.4.14.1
--- src/sys/dev/acpi/ug_acpi.c:1.4 Wed Mar 26 16:09:37 2008
+++ src/sys/dev/acpi/ug_acpi.c Fri May 1 01:38:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ug_acpi.c,v 1.4 2008/03/26 16:09:37 xtraeme Exp $ */
+/* $NetBSD: ug_acpi.c,v 1.4.14.1 2009/05/01 01:38:17 snj Exp $ */
/*
* Copyright (c) 2007 Mihai Chelaru <kef...@netbsd.ro>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ug_acpi.c,v 1.4 2008/03/26 16:09:37 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ug_acpi.c,v 1.4.14.1 2009/05/01 01:38:17 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,9 +86,6 @@
bus_space_handle_t ioh;
ACPI_STATUS rv;
- aprint_naive("\n");
- aprint_normal("\n");
-
/* parse resources */
rv = acpi_resource_parse(self, aa->aa_node->ad_handle, "_CRS",
&res, &acpi_resource_parse_ops_default);
Index: src/sys/dev/acpi/wss_acpi.c
diff -u src/sys/dev/acpi/wss_acpi.c:1.19 src/sys/dev/acpi/wss_acpi.c:1.19.14.1
--- src/sys/dev/acpi/wss_acpi.c:1.19 Sat Apr 5 21:44:50 2008
+++ src/sys/dev/acpi/wss_acpi.c Fri May 1 01:38:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_acpi.c,v 1.19 2008/04/05 21:44:50 cegger Exp $ */
+/* $NetBSD: wss_acpi.c,v 1.19.14.1 2009/05/01 01:38:17 snj Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.19 2008/04/05 21:44:50 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.19.14.1 2009/05/01 01:38:17 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,9 +125,6 @@
ACPI_STATUS rv;
struct wss_acpi_hint *wah;
- aprint_naive(": NeoMagic 256AV audio\n");
- aprint_normal(": NeoMagic 256AV audio\n");
-
wah = &wss_acpi_hints[
wss_acpi_hints_index(aa->aa_node->ad_devinfo->HardwareId.Value)];
Index: src/sys/dev/acpi/ym_acpi.c
diff -u src/sys/dev/acpi/ym_acpi.c:1.5 src/sys/dev/acpi/ym_acpi.c:1.5.14.1
--- src/sys/dev/acpi/ym_acpi.c:1.5 Sat Apr 5 21:44:50 2008
+++ src/sys/dev/acpi/ym_acpi.c Fri May 1 01:38:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ym_acpi.c,v 1.5 2008/04/05 21:44:50 cegger Exp $ */
+/* $NetBSD: ym_acpi.c,v 1.5.14.1 2009/05/01 01:38:17 snj Exp $ */
/*
* Copyright (c) 2006 Jasper Wallace <jas...@pointless.net>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.5 2008/04/05 21:44:50 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.5.14.1 2009/05/01 01:38:17 snj Exp $");
#include "mpu_ym.h"
@@ -90,9 +90,6 @@
struct ad1848_softc *ac = &sc->sc_ad1848.sc_ad1848;
ACPI_STATUS rv;
- aprint_naive("\n");
- aprint_normal("\n");
-
/* Parse our resources */
rv = acpi_resource_parse(&sc->sc_ad1848.sc_ad1848.sc_dev,
aa->aa_node->ad_handle, "_CRS", &res,
