diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-08-09 04:10:14 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-08-09 04:10:14 +0000 |
| commit | 8acbfa59711c28388979dd47c85ac8fda2aef774 (patch) | |
| tree | 0a8f13a9f8aea3ce00fc1186bafa554451900d2b /sys/dev/pci/if_ral_pci.c | |
| parent | ea9360cd901a644039d864bec59eb393c782c450 (diff) | |
do not set PCI_COMMAND_MASTER_ENABLE explicitly as it's already set in pcisubmatch(); kettenis@ testing; brad@ ok
Diffstat (limited to 'sys/dev/pci/if_ral_pci.c')
| -rw-r--r-- | sys/dev/pci/if_ral_pci.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/pci/if_ral_pci.c b/sys/dev/pci/if_ral_pci.c index 2e78813a5f2..b4c8ba52321 100644 --- a/sys/dev/pci/if_ral_pci.c +++ b/sys/dev/pci/if_ral_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral_pci.c,v 1.4 2005/02/22 10:41:30 damien Exp $ */ +/* $OpenBSD: if_ral_pci.c,v 1.5 2005/08/09 04:10:12 mickey Exp $ */ /*- * Copyright (c) 2005 @@ -95,17 +95,11 @@ ral_pci_attach(struct device *parent, struct device *self, void *aux) const char *intrstr; bus_addr_t base; pci_intr_handle_t ih; - pcireg_t reg; int error; sc->sc_dmat = pa->pa_dmat; psc->sc_pc = pa->pa_pc; - /* enable the appropriate bits in the PCI CSR */ - reg = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG); - reg |= PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_MEM_ENABLE; - pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, reg); - /* map control/status registers */ error = pci_mapreg_map(pa, RAL_PCI_BAR0, PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, &sc->sc_st, &sc->sc_sh, &base, |