summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-07-01 17:05:07 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-07-01 17:05:07 +0000
commit77c63412cf7e098aa626a2445e6380282e354bd2 (patch)
treeb0b15293fdc5a15a49af785593e099e434d30e09 /sys/dev/pci
parent182e947e13afa8bdf48abca878046f822e1d324d (diff)
See, I said the #ifdef's are a confusing maze -- they confused me.
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/vga_pci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 5f53a7dc5c9..7f7d4050938 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.48 2010/07/01 16:31:36 deraadt Exp $ */
+/* $OpenBSD: vga_pci.c,v 1.49 2010/07/01 17:05:06 deraadt Exp $ */
/* $NetBSD: vga_pci.c,v 1.3 1998/06/08 06:55:58 thorpej Exp $ */
/*
@@ -137,7 +137,7 @@ struct cfattach vga_pci_ca = {
NULL, vga_pci_activate
};
-#if !defined(SMALL_KERNEL) && defined (__i386__) || defined (__amd64__)
+#if !defined(SMALL_KERNEL) && (defined (__i386__) || defined (__amd64__))
int vga_pci_do_post;
extern int do_real_mode_post;
@@ -213,7 +213,7 @@ vga_pci_attach(struct device *parent, struct device *self, void *aux)
pcireg_t reg;
struct vga_pci_softc *sc = (struct vga_pci_softc *)self;
-#if !defined(SMALL_KERNEL) && defined (__i386__) || defined (__amd64__)
+#if !defined(SMALL_KERNEL) && (defined (__i386__) || defined (__amd64__))
int prod, vend, subid, subprod, subvend, i;
#endif
@@ -245,7 +245,7 @@ vga_pci_attach(struct device *parent, struct device *self, void *aux)
printf("couldn't set up vga POST handler\n");
#endif
-#if !defined(SMALL_KERNEL) && defined (__i386__) || defined (__amd64__)
+#if !defined(SMALL_KERNEL) && (defined (__i386__) || defined (__amd64__))
vend = PCI_VENDOR(pa->pa_id);
prod = PCI_PRODUCT(pa->pa_id);
subid = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_SUBSYS_ID_REG);