summaryrefslogtreecommitdiff
path: root/sys/dev/cardbus/cardbus.c
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2004-10-07 21:17:00 +0000
committerBrad Smith <brad@cvs.openbsd.org>2004-10-07 21:17:00 +0000
commit9350625265b367dd90f4e9d1e3a690ec3f31767b (patch)
treeb82efaabd250819cc10a7f2ea318c13bd48bb3b3 /sys/dev/cardbus/cardbus.c
parent132749700173796cbd1512b1a7b854936be23b50 (diff)
cardbusdevs -> pcidevs
From NetBSD
Diffstat (limited to 'sys/dev/cardbus/cardbus.c')
-rw-r--r--sys/dev/cardbus/cardbus.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 08643cf78b1..f9f477e7752 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cardbus.c,v 1.14 2004/09/18 00:19:48 brad Exp $ */
+/* $OpenBSD: cardbus.c,v 1.15 2004/10/07 21:16:59 brad Exp $ */
/* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */
/*
@@ -45,7 +45,7 @@
#include <machine/bus.h>
#include <dev/cardbus/cardbusvar.h>
-#include <dev/cardbus/cardbusdevs.h>
+#include <dev/pci/pcidevs.h>
#include <dev/cardbus/cardbus_exrom.h>
@@ -448,7 +448,7 @@ cardbus_attach_card(sc)
cis_ptr = cardbus_conf_read(cc, cf, tag, CARDBUS_CIS_REG);
/* Invalid vendor ID value? */
- if (CARDBUS_VENDOR(id) == CARDBUS_VENDOR_INVALID) {
+ if (CARDBUS_VENDOR(id) == PCI_VENDOR_INVALID) {
continue;
}