summaryrefslogtreecommitdiff
path: root/sys/dev/pci/pccbb.c
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2007-12-09 17:25:25 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2007-12-09 17:25:25 +0000
commit5896cdd199d4a967e7d96648b3991ff87eb9eefd (patch)
treeeddc0e8eea52662ebf4c111285a3178c01a6fb5e /sys/dev/pci/pccbb.c
parent68c77d9537ea0c71439a2b00ace24c72651b6407 (diff)
Un-#ifdef code, such that we don't attach cardbus if the bus nuber is
unconfigured. Tested by a few; ok deraadt@ (a while back).
Diffstat (limited to 'sys/dev/pci/pccbb.c')
-rw-r--r--sys/dev/pci/pccbb.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index 0366ae4c73f..11f3aeec56c 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pccbb.c,v 1.55 2007/11/30 13:43:35 deraadt Exp $ */
+/* $OpenBSD: pccbb.c,v 1.56 2007/12/09 17:25:24 kettenis Exp $ */
/* $NetBSD: pccbb.c,v 1.96 2004/03/28 09:49:31 nakayama Exp $ */
/*
@@ -456,12 +456,10 @@ pccbbattach(parent, self, aux)
* mode.
*/
busreg = pci_conf_read(pc, pa->pa_tag, PCI_BUSNUM);
-#if notyet
if (((busreg >> 8) & 0xff) == 0) {
printf(": CardBus support disabled because of unconfigured bus number\n");
flags |= PCCBB_PCMCIA_16BITONLY;
}
-#endif
/* pccbb_machdep.c end */