[src/netbsd-1-4]: src/sys/dev/pcmcia Pull up revision 1.22 (requested by enami):

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

details:   https://anonhg.NetBSD.org/src/rev/6bdd33f66e2c
branches:  netbsd-1-4
changeset: 470294:6bdd33f66e2c
user:      he <he%NetBSD.org@localhost>
date:      Sun Feb 06 17:40:32 2000 +0000

description:
Pull up revision 1.22 (requested by enami):
  Add support for the 3Com 3c574.  Partially based on PR#8331.

diffstat:

 sys/dev/pcmcia/if_ep_pcmcia.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 7d4b5db499bc -r 6bdd33f66e2c sys/dev/pcmcia/if_ep_pcmcia.c
--- a/sys/dev/pcmcia/if_ep_pcmcia.c     Sun Feb 06 17:40:09 2000 +0000
+++ b/sys/dev/pcmcia/if_ep_pcmcia.c     Sun Feb 06 17:40:32 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ep_pcmcia.c,v 1.21 1998/12/24 03:57:45 marc Exp $   */
+/*     $NetBSD: if_ep_pcmcia.c,v 1.21.2.1 2000/02/06 17:40:32 he Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -160,7 +160,7 @@
          PCMCIA_STR_3COM_3CXEM556 },
 
        { PCMCIA_PRODUCT_3COM_3C574,    ELINK_CHIPSET_ROADRUNNER,
-         ELINK_FLAGS_MII,                      0,
+         ELINK_FLAGS_MII,              0,
          PCMCIA_STR_3COM_3C574 },
 
        { 0,                            0,
@@ -349,14 +349,15 @@
                break;
        }
 
-       sc->bustype = ELINK_BUS_PCMCIA;
-
        epp = ep_pcmcia_lookup(pa);
        if (epp == NULL)
                panic("ep_pcmcia_attach: impossible");
 
        printf(": %s\n", epp->epp_name);
-       
+
+       sc->bustype = ELINK_BUS_PCMCIA;
+       sc->ep_flags = epp->epp_flags;
+
        sc->enable = ep_pcmcia_enable;
        sc->disable = ep_pcmcia_disable;