[src/netbsd-1-5]: src/sys/dev/pci Sync with NetBSD-current (pull up approved ...

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

details:   https://anonhg.NetBSD.org/src/rev/b8cd72efed88
branches:  netbsd-1-5
changeset: 488536:b8cd72efed88
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Jul 15 22:48:01 2000 +0000

description:
Sync with NetBSD-current (pull up approved by thorpej):

syssrc/sys/dev/pci/if_epic_pci.c, 1.11
syssrc/sys/dev/pci/if_tlp_pci.c, 1.42

Avoid printing duplicate colon when card is waked up.

diffstat:

 sys/dev/pci/if_epic_pci.c |  4 ++--
 sys/dev/pci/if_tlp_pci.c  |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r d22d44826df1 -r b8cd72efed88 sys/dev/pci/if_epic_pci.c
--- a/sys/dev/pci/if_epic_pci.c Sat Jul 15 20:34:40 2000 +0000
+++ b/sys/dev/pci/if_epic_pci.c Sat Jul 15 22:48:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_epic_pci.c,v 1.7.12.2 2000/07/15 19:47:04 tron Exp $        */
+/*     $NetBSD: if_epic_pci.c,v 1.7.12.3 2000/07/15 22:48:01 tron Exp $        */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -177,7 +177,7 @@
                        return;
                }
                if (reg != 0) {
-                       printf(": waking up from power state D%d\n%s: ",
+                       printf(": waking up from power state D%d\n%s",
                            reg, sc->sc_dev.dv_xname);
                        pci_conf_write(pc, pa->pa_tag, pmreg + 4, 0);
                }
diff -r d22d44826df1 -r b8cd72efed88 sys/dev/pci/if_tlp_pci.c
--- a/sys/dev/pci/if_tlp_pci.c  Sat Jul 15 20:34:40 2000 +0000
+++ b/sys/dev/pci/if_tlp_pci.c  Sat Jul 15 22:48:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tlp_pci.c,v 1.39.2.2 2000/07/15 19:47:05 tron Exp $ */
+/*     $NetBSD: if_tlp_pci.c,v 1.39.2.3 2000/07/15 22:48:01 tron Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -492,7 +492,7 @@
                        return;
                }
                if (reg != 0) {
-                       printf(": waking up from power state D%d\n%s: ",
+                       printf(": waking up from power state D%d\n%s",
                            reg, sc->sc_dev.dv_xname);
                        pci_conf_write(pc, pa->pa_tag, pmreg + 4, 0);
                }