Module Name: src
Committed By: jakllsch
Date: Thu Nov 10 20:12:49 UTC 2011
Modified Files:
src/sys/dev/pci: if_tlp_pci.c
Log Message:
When applying the board-specific bits for the SMC 9332,
the mediasw has already been set to non-NULL, don't require it to be NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/pci/if_tlp_pci.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_tlp_pci.c
diff -u src/sys/dev/pci/if_tlp_pci.c:1.118 src/sys/dev/pci/if_tlp_pci.c:1.119
--- src/sys/dev/pci/if_tlp_pci.c:1.118 Tue Jul 26 20:51:24 2011
+++ src/sys/dev/pci/if_tlp_pci.c Thu Nov 10 20:12:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_pci.c,v 1.118 2011/07/26 20:51:24 dyoung Exp $ */
+/* $NetBSD: if_tlp_pci.c,v 1.119 2011/11/10 20:12:48 jakllsch Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.118 2011/07/26 20:51:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.119 2011/11/10 20:12:48 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1380,9 +1380,6 @@ tlp_pci_smc_21140_quirks(struct tulip_pc
{
struct tulip_softc *sc = &psc->sc_tulip;
- if (sc->sc_mediasw != NULL) {
- return;
- }
strcpy(psc->sc_tulip.sc_name, "SMC 9332DST");
sc->sc_mediasw = &tlp_smc9332dst_mediasw;
}
