Module Name: src
Committed By: snj
Date: Fri May 1 01:39:25 UTC 2009
Modified Files:
src/sys/arch/i386/acpi [netbsd-5]: npx_acpi.c spic_acpi.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #498):
sys/arch/i386/acpi/npx_acpi.c: revision 1.18
sys/arch/i386/acpi/spic_acpi.c: revision 1.21
Adjust for acpi_resource_parse aprint changes, noted by Jukka Salmi
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.14.1 src/sys/arch/i386/acpi/npx_acpi.c
cvs rdiff -u -r1.20 -r1.20.10.1 src/sys/arch/i386/acpi/spic_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/arch/i386/acpi/npx_acpi.c
diff -u src/sys/arch/i386/acpi/npx_acpi.c:1.17 src/sys/arch/i386/acpi/npx_acpi.c:1.17.14.1
--- src/sys/arch/i386/acpi/npx_acpi.c:1.17 Tue Mar 4 14:53:38 2008
+++ src/sys/arch/i386/acpi/npx_acpi.c Fri May 1 01:39:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: npx_acpi.c,v 1.17 2008/03/04 14:53:38 cube Exp $ */
+/* $NetBSD: npx_acpi.c,v 1.17.14.1 2009/05/01 01:39:24 snj Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npx_acpi.c,v 1.17 2008/03/04 14:53:38 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npx_acpi.c,v 1.17.14.1 2009/05/01 01:39:24 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,9 +88,6 @@
struct acpi_irq *irq;
ACPI_STATUS rv;
- aprint_naive("\n");
- aprint_normal("\n");
-
sc->sc_dev = self;
/* parse resources */
Index: src/sys/arch/i386/acpi/spic_acpi.c
diff -u src/sys/arch/i386/acpi/spic_acpi.c:1.20 src/sys/arch/i386/acpi/spic_acpi.c:1.20.10.1
--- src/sys/arch/i386/acpi/spic_acpi.c:1.20 Sun May 4 16:13:35 2008
+++ src/sys/arch/i386/acpi/spic_acpi.c Fri May 1 01:39:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: spic_acpi.c,v 1.20 2008/05/04 16:13:35 xtraeme Exp $ */
+/* $NetBSD: spic_acpi.c,v 1.20.10.1 2009/05/01 01:39:24 snj Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spic_acpi.c,v 1.20 2008/05/04 16:13:35 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spic_acpi.c,v 1.20.10.1 2009/05/01 01:39:24 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,9 +88,6 @@
ACPI_STATUS rv;
- aprint_naive(": Sony Programmable I/O Controller\n");
- aprint_normal(": Sony Programmable I/O Controller\n");
-
sc->sc_spic.sc_dev = self;
sc->sc_node = aa->aa_node;
