CVS commit: [netbsd-5] src/sys/dev/pci

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Sat Nov 20 17:38:28 UTC 2010

Modified Files:
        src/sys/dev/pci [netbsd-5]: if_pcn.c

Log Message:
Pull up following revision(s) (requested by hubertf in ticket #1385):
        sys/dev/pci/if_pcn.c: revision 1.51
silence "boot -z"


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.46.14.1 src/sys/dev/pci/if_pcn.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/pci/if_pcn.c
diff -u src/sys/dev/pci/if_pcn.c:1.46 src/sys/dev/pci/if_pcn.c:1.46.14.1
--- src/sys/dev/pci/if_pcn.c:1.46	Fri Apr  4 12:20:48 2008
+++ src/sys/dev/pci/if_pcn.c	Sat Nov 20 17:38:28 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_pcn.c,v 1.46 2008/04/04 12:20:48 tsutsui Exp $	*/
+/*	$NetBSD: if_pcn.c,v 1.46.14.1 2010/11/20 17:38:28 riz Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.46 2008/04/04 12:20:48 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.46.14.1 2010/11/20 17:38:28 riz Exp $");
 
 #include "bpfilter.h"
 #include "rnd.h"
@@ -2037,12 +2037,12 @@
 
 #define	ADD(str, m, d)							\
 do {									\
-	printf("%s%s", sep, str);					\
+	aprint_normal("%s%s", sep, str);					\
 	ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|(m), (d), NULL);	\
 	sep = ", ";							\
 } while (/*CONSTCOND*/0)
 
-	printf("%s: ", device_xname(sc->sc_dev));
+	aprint_normal("%s: ", device_xname(sc->sc_dev));
 	ADD("10base5", IFM_10_5, PORTSEL_AUI);
 	if (sc->sc_variant->pcv_chipid == PARTID_Am79c970A)
 		ADD("10base5-FDX", IFM_10_5|IFM_FDX, PORTSEL_AUI);
@@ -2052,7 +2052,7 @@
 	ADD("auto", IFM_AUTO, 0);
 	if (sc->sc_variant->pcv_chipid == PARTID_Am79c970A)
 		ADD("auto-FDX", IFM_AUTO|IFM_FDX, 0);
-	printf("\n");
+	aprint_normal("\n");
 
 	ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO);
 }