summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2006-06-29 21:36:41 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2006-06-29 21:36:41 +0000
commitb84fff708dd468c0451c1ce2dda20f3611a3027a (patch)
tree706cb10e4bcd7d5dd71e4f40c7840879a575fe37 /sys/dev
parent8c4c7e0c0fd8308f822562ec866175730d74bfb3 (diff)
do not check for master/io/mem enables
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_txp.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index 02f921fb3c3..fc7766b6dae 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_txp.c,v 1.82 2006/05/28 00:04:24 jason Exp $ */
+/* $OpenBSD: if_txp.c,v 1.83 2006/06/29 21:36:40 deraadt Exp $ */
/*
* Copyright (c) 2001
@@ -261,21 +261,9 @@ txp_attach(parent, self, aux)
pci_intr_handle_t ih;
const char *intrstr = NULL;
bus_size_t iosize;
- u_int32_t command;
sc->sc_cold = 1;
- command = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
-
- if (!(command & PCI_COMMAND_MASTER_ENABLE)) {
- printf(": failed to enable bus mastering\n");
- return;
- }
-
- if (!(command & PCI_COMMAND_MEM_ENABLE)) {
- printf(": failed to enable memory mapping\n");
- return;
- }
if (pci_mapreg_map(pa, TXP_PCI_LOMEM, PCI_MAPREG_TYPE_MEM, 0,
&sc->sc_bt, &sc->sc_bh, NULL, &iosize, 0)) {
printf(": can't map mem space %d\n", 0);