diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-01-03 11:49:17 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-01-03 11:49:17 +0000 |
| commit | 8f2a7094ed1bf1b16d6d21f6060e5890a0a10cc4 (patch) | |
| tree | 44fe0dade219a4bb10ed395270dfad3c42faabb2 /sys | |
| parent | 3d33115724666f0ed2c1ebd29f606e9d0a432308 (diff) | |
Don't say 'Marvell' twice for each sk/msk device in dmesg. No functional
change.
from brad@ ok mglocker@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_msk.c | 12 | ||||
| -rw-r--r-- | sys/dev/pci/if_sk.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 286adef252a..439c03a7f8d 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_msk.c,v 1.38 2006/12/30 22:08:15 kettenis Exp $ */ +/* $OpenBSD: if_msk.c,v 1.39 2007/01/03 11:49:16 krw Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -1287,19 +1287,19 @@ mskc_attach(struct device *parent, struct device *self, void *aux) switch (sc->sk_type) { case SK_YUKON_XL: - sc->sk_name = "Marvell Yukon-2 XL"; + sc->sk_name = "Yukon-2 XL"; break; case SK_YUKON_EC_U: - sc->sk_name = "Marvell Yukon-2 EC Ultra"; + sc->sk_name = "Yukon-2 EC Ultra"; break; case SK_YUKON_EC: - sc->sk_name = "Marvell Yukon-2 EC"; + sc->sk_name = "Yukon-2 EC"; break; case SK_YUKON_FE: - sc->sk_name = "Marvell Yukon-2 FE"; + sc->sk_name = "Yukon-2 FE"; break; default: - sc->sk_name = "Marvell Yukon (Unknown)"; + sc->sk_name = "Yukon (Unknown)"; } if (sc->sk_type == SK_YUKON_XL) { diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index d21353648de..5c67baf4640 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.132 2006/12/06 23:34:44 reyk Exp $ */ +/* $OpenBSD: if_sk.c,v 1.133 2007/01/03 11:49:16 krw Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -1426,19 +1426,19 @@ skc_attach(struct device *parent, struct device *self, void *aux) switch (sc->sk_type) { case SK_GENESIS: - sc->sk_name = "SysKonnect GEnesis"; + sc->sk_name = "GEnesis"; break; case SK_YUKON: - sc->sk_name = "Marvell Yukon"; + sc->sk_name = "Yukon"; break; case SK_YUKON_LITE: - sc->sk_name = "Marvell Yukon Lite"; + sc->sk_name = "Yukon Lite"; break; case SK_YUKON_LP: - sc->sk_name = "Marvell Yukon LP"; + sc->sk_name = "Yukon LP"; break; default: - sc->sk_name = "Marvell Yukon (Unknown)"; + sc->sk_name = "Yukon (Unknown)"; } /* Yukon Lite Rev A0 needs special test, from sk98lin driver */ |