diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2004-10-07 21:17:00 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2004-10-07 21:17:00 +0000 |
| commit | 9350625265b367dd90f4e9d1e3a690ec3f31767b (patch) | |
| tree | b82efaabd250819cc10a7f2ea318c13bd48bb3b3 /sys/dev/cardbus/com_cardbus.c | |
| parent | 132749700173796cbd1512b1a7b854936be23b50 (diff) | |
cardbusdevs -> pcidevs
From NetBSD
Diffstat (limited to 'sys/dev/cardbus/com_cardbus.c')
| -rw-r--r-- | sys/dev/cardbus/com_cardbus.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c index 3c2d9417550..838e627ec0d 100644 --- a/sys/dev/cardbus/com_cardbus.c +++ b/sys/dev/cardbus/com_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_cardbus.c,v 1.8 2004/07/12 22:52:35 brad Exp $ */ +/* $OpenBSD: com_cardbus.c,v 1.9 2004/10/07 21:16:59 brad Exp $ */ /* $NetBSD: com_cardbus.c,v 1.4 2000/04/17 09:21:59 joda Exp $ */ /* @@ -52,7 +52,7 @@ #include <sys/device.h> #include <dev/cardbus/cardbusvar.h> -#include <dev/cardbus/cardbusdevs.h> +#include <dev/pci/pcidevs.h> #include <dev/pcmcia/pcmciareg.h> @@ -120,15 +120,15 @@ static struct csdev { cardbusreg_t reg; int type; } csdevs[] = { - { CARDBUS_VENDOR_XIRCOM, CARDBUS_PRODUCT_XIRCOM_MODEM56, + { PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_MODEM56, CARDBUS_BASE0_REG, CARDBUS_MAPREG_TYPE_IO }, - { CARDBUS_VENDOR_XIRCOM, CARDBUS_PRODUCT_XIRCOM_CBEM56G, + { PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_CBEM56G, CARDBUS_BASE0_REG, CARDBUS_MAPREG_TYPE_IO }, - { CARDBUS_VENDOR_INTEL, CARDBUS_PRODUCT_INTEL_MODEM56, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MODEM56, CARDBUS_BASE0_REG, CARDBUS_MAPREG_TYPE_IO }, - { CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_MODEM56, + { PCI_VENDOR_3COM, PCI_PRODUCT_3COM_MODEM56, CARDBUS_BASE0_REG, CARDBUS_MAPREG_TYPE_IO }, - { CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_GLOBALMODEM56, + { PCI_VENDOR_3COM, PCI_PRODUCT_3COM_GLOBALMODEM56, CARDBUS_BASE0_REG, CARDBUS_MAPREG_TYPE_IO } }; |