summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2004-02-04 20:03:29 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2004-02-04 20:03:29 +0000
commit45b41c3dde30ea9908291457a4806d711de6158b (patch)
tree63e11a4d446735f05e15b48c2355807f2c9c13a3 /sys/dev
parent8933ad835eb69d71d2b33e581978df2d7e8a25b8 (diff)
Change these defines to be a display specific define and also remove
the really long define. ok deraadt@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/vga_pci.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index ed352c5355a..a2ede396e7e 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga_pci.c,v 1.15 2003/10/31 04:10:05 drahn Exp $ */
+/* $OpenBSD: vga_pci.c,v 1.16 2004/02/04 20:03:28 drahn Exp $ */
/* $NetBSD: vga_pci.c,v 1.3 1998/06/08 06:55:58 thorpej Exp $ */
/*-
@@ -176,8 +176,8 @@ vga_pci_match(parent, match, aux)
/*
* If we might match, make sure that the card actually looks OK.
*/
-#ifdef ISA_SPACE_NOT_ACCESSABLE_WITH_PCI_IOT
- if (!vga_common_probe(MD_ISA_IOT, MD_ISA_MEMT))
+#ifdef MD_DISPLAY_ISA_IOT
+ if (!vga_common_probe(MD_DISPLAY_ISA_IOT, MD_DISPLAY_ISA_MEMT))
return (0);
#else
if (!vga_common_probe(pa->pa_iot, pa->pa_memt))
@@ -192,7 +192,7 @@ vga_pci_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
-#ifndef ISA_SPACE_NOT_ACCESSABLE_WITH_PCI_IOT
+#ifndef MD_DISPLAY_ISA_IOT
struct pci_attach_args *pa = aux;
#endif
#ifdef PCIAGP
@@ -259,8 +259,8 @@ vga_pci_attach(parent, self, aux)
}
#endif
printf("\n");
-#ifdef ISA_SPACE_NOT_ACCESSABLE_WITH_PCI_IOT
- vga_extended_attach(self, MD_ISA_IOT, ppc_isa_membus_space,
+#ifdef MD_DISPLAY_ISA_IOT
+ vga_extended_attach(self, MD_DISPLAY_ISA_IOT, ppc_isa_membus_space,
WSDISPLAY_TYPE_PCIVGA, vga_pci_mmap);
#else
vga_common_attach(self, pa->pa_iot, pa->pa_memt,