[src/netbsd-1-6]: src/sys/dev/pcmcia Pull up revision 1.24 (requested by mart...

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

details:   https://anonhg.NetBSD.org/src/rev/989376de4ed7
branches:  netbsd-1-6
changeset: 527972:989376de4ed7
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Jun 18 14:31:26 2002 +0000

description:
Pull up revision 1.24 (requested by martin in ticket #295):
Add support for Zcomax/ELSA XI325. From Jasper Wallace in PR 17252.

diffstat:

 sys/dev/pcmcia/if_wi_pcmcia.c |  19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diffs (47 lines):

diff -r 2027e48aa7c7 -r 989376de4ed7 sys/dev/pcmcia/if_wi_pcmcia.c
--- a/sys/dev/pcmcia/if_wi_pcmcia.c     Tue Jun 18 14:30:28 2002 +0000
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c     Tue Jun 18 14:31:26 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pcmcia.c,v 1.19.2.2 2002/06/10 16:26:11 tv Exp $ */
+/* $NetBSD: if_wi_pcmcia.c,v 1.19.2.3 2002/06/18 14:31:26 lukem Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.19.2.2 2002/06/10 16:26:11 tv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.19.2.3 2002/06/18 14:31:26 lukem Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -172,6 +172,16 @@
          PCMCIA_CIS_ELSA_XI300_IEEE,
          PCMCIA_STR_ELSA_XI300_IEEE },
 
+       { PCMCIA_VENDOR_ELSA,
+         PCMCIA_PRODUCT_ELSA_XI325_IEEE,
+         PCMCIA_CIS_ELSA_XI325_IEEE,
+         PCMCIA_STR_ELSA_XI325_IEEE },
+
+       { PCMCIA_VENDOR_ELSA,
+         PCMCIA_PRODUCT_ELSA_XI800_IEEE,
+         PCMCIA_CIS_ELSA_XI800_IEEE,
+         PCMCIA_STR_ELSA_XI800_IEEE },
+
        { PCMCIA_VENDOR_COMPAQ,
          PCMCIA_PRODUCT_COMPAQ_NC5004,
          PCMCIA_CIS_COMPAQ_NC5004,
@@ -222,11 +232,6 @@
          PCMCIA_CIS_GEMTEK_WLAN,
          PCMCIA_STR_GEMTEK_WLAN },
 
-       { PCMCIA_VENDOR_ELSA,
-         PCMCIA_PRODUCT_ELSA_XI800_IEEE,
-         PCMCIA_CIS_ELSA_XI800_IEEE,
-         PCMCIA_STR_ELSA_XI800_IEEE },
-
        { PCMCIA_VENDOR_SIMPLETECH,
          PCMCIA_PRODUCT_SIMPLETECH_SPECTRUM24_ALT,
          PCMCIA_CIS_SIMPLETECH_SPECTRUM24_ALT,