CVS commit: [netbsd-7] src/sys/dev

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Thu Jan  8 11:07:43 UTC 2015

Modified Files:
        src/sys/dev/acpi [netbsd-7]: acpi_ec.c
        src/sys/dev/isa [netbsd-7]: pcppi.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #392):
        sys/dev/acpi/acpi_ec.c: revision 1.74
        sys/dev/isa/pcppi.c: revision 1.43
Add missing newlines...


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.73.2.1 src/sys/dev/acpi/acpi_ec.c
cvs rdiff -u -r1.42 -r1.42.14.1 src/sys/dev/isa/pcppi.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.73 src/sys/dev/acpi/acpi_ec.c:1.73.2.1
--- src/sys/dev/acpi/acpi_ec.c:1.73	Sun Jul  6 15:35:42 2014
+++ src/sys/dev/acpi/acpi_ec.c	Thu Jan  8 11:07:43 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_ec.c,v 1.73 2014/07/06 15:35:42 riastradh Exp $	*/
+/*	$NetBSD: acpi_ec.c,v 1.73.2.1 2015/01/08 11:07:43 martin 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.73 2014/07/06 15:35:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.73.2.1 2015/01/08 11:07:43 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -267,6 +267,8 @@ acpiec_attach(device_t parent, device_t 
 		aprint_normal(": using %s\n", device_xname(ec_singleton));
 		goto fail0;
 	}
+	aprint_naive("\n");
+	aprint_normal("\n");
 
 	if (!acpiec_parse_gpe_package(self, aa->aa_node->ad_handle,
 				      &gpe_handle, &gpebit))

Index: src/sys/dev/isa/pcppi.c
diff -u src/sys/dev/isa/pcppi.c:1.42 src/sys/dev/isa/pcppi.c:1.42.14.1
--- src/sys/dev/isa/pcppi.c:1.42	Fri Apr  6 20:33:20 2012
+++ src/sys/dev/isa/pcppi.c	Thu Jan  8 11:07:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pcppi.c,v 1.42 2012/04/06 20:33:20 plunky Exp $ */
+/* $NetBSD: pcppi.c,v 1.42.14.1 2015/01/08 11:07:43 martin Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.42 2012/04/06 20:33:20 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.42.14.1 2015/01/08 11:07:43 martin Exp $");
 
 #include "attimer.h"
 
@@ -167,6 +167,7 @@ pcppi_isa_attach(device_t parent, device
         if (bus_space_map(iot, IO_PPI, sc->sc_size, 0, &sc->sc_ppi_ioh))
                 panic("pcppi_attach: couldn't map");
 
+	aprint_naive("\n");
 	aprint_normal("\n");
         pcppi_attach(sc);
 }