Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-7]: src/sys/dev Pull up following revision(s) (requested by msait...



details:   https://anonhg.NetBSD.org/src/rev/5d536c5d7f13
branches:  netbsd-7
changeset: 798800:5d536c5d7f13
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jan 08 11:07:43 2015 +0000

description:
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...

diffstat:

 sys/dev/acpi/acpi_ec.c |  6 ++++--
 sys/dev/isa/pcppi.c    |  5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r 4df08524306f -r 5d536c5d7f13 sys/dev/acpi/acpi_ec.c
--- a/sys/dev/acpi/acpi_ec.c    Thu Jan 08 11:01:01 2015 +0000
+++ b/sys/dev/acpi/acpi_ec.c    Thu Jan 08 11:07:43 2015 +0000
@@ -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 <joerg%NetBSD.org@localhost>.
@@ -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 @@
                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))
diff -r 4df08524306f -r 5d536c5d7f13 sys/dev/isa/pcppi.c
--- a/sys/dev/isa/pcppi.c       Thu Jan 08 11:01:01 2015 +0000
+++ b/sys/dev/isa/pcppi.c       Thu Jan 08 11:07:43 2015 +0000
@@ -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 @@
         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);
 }



Home | Main Index | Thread Index | Old Index