[src/netbsd-1-6]: src/sys/dev/cardbus Pull up revision 1.4 (requested by luke...

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

details:   https://anonhg.NetBSD.org/src/rev/40364bdc0792
branches:  netbsd-1-6
changeset: 527703:40364bdc0792
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Jun 04 11:22:13 2002 +0000

description:
Pull up revision 1.4 (requested by lukem in ticket #144):
make this compile again

diffstat:

 sys/dev/cardbus/rbus_ppb.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 056034abdc2a -r 40364bdc0792 sys/dev/cardbus/rbus_ppb.c
--- a/sys/dev/cardbus/rbus_ppb.c        Tue Jun 04 11:18:59 2002 +0000
+++ b/sys/dev/cardbus/rbus_ppb.c        Tue Jun 04 11:22:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbus_ppb.c,v 1.3 2002/05/16 01:01:28 thorpej Exp $     */
+/*     $NetBSD: rbus_ppb.c,v 1.3.4.1 2002/06/04 11:22:13 lukem Exp $   */
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.3 2002/05/16 01:01:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.3.4.1 2002/06/04 11:22:13 lukem Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -705,7 +705,7 @@
        pci_devinfo(ca->ca_id, ca->ca_class, 0, devinfo);
        printf(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(ca->ca_class));
 
-       sc->sc_tag = ca->ca_tag;        /* XXX cardbustag_t == pcitag_t */
+       csc->sc_tag = ca->ca_tag;       /* XXX cardbustag_t == pcitag_t */
 
        busdata = cardbus_conf_read(cc, cf, ca->ca_tag, PPB_REG_BUSINFO);
        minbus = pcibios_max_bus;
@@ -780,7 +780,7 @@
        pba.pba_pc   = psc->sc_pc;
        pba.pba_flags    = PCI_FLAGS_IO_ENABLED|PCI_FLAGS_MEM_ENABLED;
        pba.pba_bus      = PPB_BUSINFO_SECONDARY(busdata);
-       pba.pba_bridgetag = &sc->sc_tag;
+       pba.pba_bridgetag = &csc->sc_tag;
        /*pba.pba_intrswiz = parent_sc->sc_intrswiz; */
        pba.pba_intrtag  = psc->sc_pa.pa_intrtag;