summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2007-10-25 13:49:06 +0000
committerjoerg <joerg@NetBSD.org>2007-10-25 13:49:06 +0000
commit16951292eb05593a6b2184de4cfe469cc239d4d9 (patch)
tree58169706e7ea1b4793ee7b233010305f2ff197c4 /sys/dev
parent3f59c64134b0da216816a37e7bafe19d447429f2 (diff)
Remove a completely bogus check if cbb has a valid PCI interrupt routed.
If you have a system where it doesn't get one and you still want pcic, you can just disable cbb. This check is invalid as soon as the PCI interrupt register is not used and broke on my Dell Latitude for that reason.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/pccbb.c25
1 files changed, 2 insertions, 23 deletions
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index aa04fd9359b..5a8eb2f2181 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pccbb.c,v 1.149 2007/10/22 14:03:51 joerg Exp $ */
+/* $NetBSD: pccbb.c,v 1.150 2007/10/25 13:49:06 joerg Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.149 2007/10/22 14:03:51 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.150 2007/10/25 13:49:06 joerg Exp $");
/*
#define CBB_DEBUG
@@ -79,11 +79,6 @@ __KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.149 2007/10/22 14:03:51 joerg Exp $");
#include "locators.h"
-#if defined(__i386__)
-#include "ioapic.h"
-#include "acpi.h"
-#endif
-
#ifndef __NetBSD_Version__
struct cfdriver cbb_cd = {
NULL, "cbb", DV_DULL
@@ -507,22 +502,6 @@ pccbbattach(struct device *parent, struct device *self, void *aux)
sc->sc_mem_start = 0; /* XXX */
sc->sc_mem_end = 0xffffffff; /* XXX */
- /*
- * When interrupt isn't routed correctly, give up probing cbb and do
- * not kill pcic-compatible port.
- *
- * However, if we are using an ioapic, avoid this check -- pa_intrline
- * may well be zero, with the interrupt routed through the apic.
- */
-
-#if NIOAPIC == 0 && NACPI == 0
- if ((0 == pa->pa_intrline) || (255 == pa->pa_intrline)) {
- printf("%s: NOT USED because of unconfigured interrupt\n",
- sc->sc_dev.dv_xname);
- return;
- }
-#endif
-
busreg = pci_conf_read(pc, pa->pa_tag, PCI_BUSNUM);
/* pccbb_machdep.c end */