summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2001-01-21 18:10:38 +0000
committerimp <imp@FreeBSD.org>2001-01-21 18:10:38 +0000
commitd326c51b74ea24afabc190774a1b7721c3e6d1e8 (patch)
tree8f5e76b849d9b1ca90782be202502581f9584915 /sys
parent4df68a4783c09a4ba64d78eaffc7e4da565074fc (diff)
downloadFreeBSD-src-d326c51b74ea24afabc190774a1b7721c3e6d1e8.zip
FreeBSD-src-d326c51b74ea24afabc190774a1b7721c3e6d1e8.tar.gz
wi has been converted to NEWCARD, so included it when pccard is
included. Also, I forgot to update this to the new cis[] structure last night, mainly due to the above omission.
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files1
-rw-r--r--sys/dev/wi/if_wi.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 23eb852..7ab8e20 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -539,6 +539,7 @@ dev/vx/if_vx_eisa.c optional vx eisa
dev/vx/if_vx_pci.c optional vx pci
dev/wds/wd7000.c optional wds isa
dev/wi/if_wi.c optional wi card
+dev/wi/if_wi.c optional wi pccard
dev/xe/if_xe.c optional xe card
fs/devfs/devfs_vnops.c optional devfs
fs/devfs/devfs_vfsops.c optional devfs
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 0b2415d..37f4f1b 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -184,8 +184,8 @@ DRIVER_MODULE(if_wi, pccard, wi_pccard_driver, wi_pccard_devclass, 0, 0);
static const struct pccard_product wi_pccard_products[] = {
{ PCCARD_STR_LUCENT_WAVELAN_IEEE, PCCARD_VENDOR_LUCENT,
- PCCARD_PRODUCT_LUCENT_WAVELAN_IEEE, 0, NULL, NULL },
- { NULL }
+ PCCARD_PRODUCT_LUCENT_WAVELAN_IEEE, 0,
+ PCCARD_CIS_LUCENT_WAVELAN_IEEE },
};
static int wi_pccard_match(dev)
OpenPOWER on IntegriCloud