[src/netbsd-2]: src/sys Pull up following revision(s) (requested by riz in ti...

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

details:   https://anonhg.NetBSD.org/src/rev/5d3534f44f02
branches:  netbsd-2
changeset: 564524:5d3534f44f02
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Sep 11 21:32:24 2006 +0000

description:
Pull up following revision(s) (requested by riz in ticket #10693):
        sys/arch/cobalt/pci/pchb.c: revision 1.9 via patch
        sys/dev/pci/if_sk.c: revision 1.30 via patch
        sys/arch/evbmips/malta/pci/pchb.c: revision 1.9 via patch
Vendor GALILEO is now MARVELL.

diffstat:

 sys/arch/cobalt/pci/pchb.c        |   8 ++++----
 sys/arch/evbmips/malta/pci/pchb.c |  12 ++++++------
 sys/dev/pci/if_sk.c               |  10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diffs (108 lines):

diff -r d552a1ea0945 -r 5d3534f44f02 sys/arch/cobalt/pci/pchb.c
--- a/sys/arch/cobalt/pci/pchb.c        Mon Sep 11 21:31:30 2006 +0000
+++ b/sys/arch/cobalt/pci/pchb.c        Mon Sep 11 21:32:24 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pchb.c,v 1.6 2003/07/15 01:29:23 lukem Exp $   */
+/*     $NetBSD: pchb.c,v 1.6.6.1 2006/09/11 21:32:24 tron Exp $        */
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.6 2003/07/15 01:29:23 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.6.6.1 2006/09/11 21:32:24 tron Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -54,8 +54,8 @@
 {
        struct pci_attach_args *pa = aux;
 
-       if ((PCI_VENDOR(pa->pa_id) == PCI_VENDOR_GALILEO) &&
-           (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_GALILEO_GT64011))
+       if ((PCI_VENDOR(pa->pa_id) == PCI_VENDOR_MARVELL) &&
+           (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_MARVELL_GT64011))
                return 1;
 
        return 0;
diff -r d552a1ea0945 -r 5d3534f44f02 sys/arch/evbmips/malta/pci/pchb.c
--- a/sys/arch/evbmips/malta/pci/pchb.c Mon Sep 11 21:31:30 2006 +0000
+++ b/sys/arch/evbmips/malta/pci/pchb.c Mon Sep 11 21:32:24 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pchb.c,v 1.6 2003/07/15 01:37:34 lukem Exp $   */
+/*     $NetBSD: pchb.c,v 1.6.4.1 2006/09/11 21:32:24 tron Exp $        */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.6 2003/07/15 01:37:34 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.6.4.1 2006/09/11 21:32:24 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -63,9 +63,9 @@
        if (PCI_CLASS(pa->pa_class) == PCI_CLASS_BRIDGE &&
            PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_BRIDGE_HOST) {
                switch (PCI_VENDOR(pa->pa_id)) {
-               case PCI_VENDOR_GALILEO:
+               case PCI_VENDOR_MARVELL:
                        switch (PCI_PRODUCT(pa->pa_id)) {
-                       case PCI_PRODUCT_GALILEO_GT64120:
+                       case PCI_PRODUCT_MARVELL_GT64120:
                                return (!pcifound);
                        }
                        break;
@@ -88,8 +88,8 @@
         * might want to add code that does something that's
         * possibly chipset-specific.
         */
-       if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_GALILEO &&
-           PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_GALILEO_GT64120) {
+       if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_MARVELL &&
+           PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_MARVELL_GT64120) {
                /* Bah, same product ID... */
 
                /*
diff -r d552a1ea0945 -r 5d3534f44f02 sys/dev/pci/if_sk.c
--- a/sys/dev/pci/if_sk.c       Mon Sep 11 21:31:30 2006 +0000
+++ b/sys/dev/pci/if_sk.c       Mon Sep 11 21:32:24 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_sk.c,v 1.7.2.3.2.10 2006/09/07 00:14:13 rpaulo Exp $        */
+/*     $NetBSD: if_sk.c,v 1.7.2.3.2.11 2006/09/11 21:32:24 tron Exp $  */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -269,8 +269,8 @@
        { PCI_VENDOR_LINKSYS, PCI_PRODUCT_LINKSYS_EG1064, },
        { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SKNET_GE, },
        { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9821v2, },
-       { PCI_VENDOR_GALILEO, PCI_PRODUCT_GALILEO_SKNET, },
-       { PCI_VENDOR_GALILEO, PCI_PRODUCT_GALILEO_BELKIN, },
+       { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_SKNET, },
+       { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_BELKIN, },
        { 0, 0, }
 };
 
@@ -1733,7 +1733,7 @@
        case PCI_ID_CODE(PCI_VENDOR_LINKSYS,PCI_PRODUCT_LINKSYS_EG1064):
                sc->sk_name = sc->sk_vpd_prodname;
                break;
-       case PCI_ID_CODE(PCI_VENDOR_GALILEO,PCI_PRODUCT_GALILEO_SKNET):
+       case PCI_ID_CODE(PCI_VENDOR_MARVELL,PCI_PRODUCT_MARVELL_SKNET):
        /* whoops yukon vpd prodname bears no resemblance to reality */
                switch (sc->sk_type) {
                case SK_GENESIS:
@@ -1773,7 +1773,7 @@
                        }
                }
                break;
-       case PCI_ID_CODE(PCI_VENDOR_GALILEO,PCI_PRODUCT_GALILEO_BELKIN):
+       case PCI_ID_CODE(PCI_VENDOR_MARVELL,PCI_PRODUCT_MARVELL_BELKIN):
                sc->sk_name = sc->sk_vpd_prodname;
                break;
        default: