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_sis.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_sis.c')
| -rw-r--r-- | sys/dev/pci/if_sis.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c index 7bb79e809a6..9fa6c05b0c2 100644 --- a/sys/dev/pci/if_sis.c +++ b/sys/dev/pci/if_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sis.c,v 1.50 2005/07/28 18:39:32 brad Exp $ */ +/* $OpenBSD: if_sis.c,v 1.51 2005/08/09 04:10:12 mickey Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -858,7 +858,7 @@ void sis_attach(parent, self, aux) { int i, s; const char *intrstr = NULL; - u_int32_t command; + pcireg_t command; struct sis_softc *sc = (struct sis_softc *)self; struct pci_attach_args *pa = aux; pci_chipset_tag_t pc = pa->pa_pc; @@ -914,10 +914,6 @@ void sis_attach(parent, self, aux) * Map control/status registers. */ command = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG); - command |= PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE | - PCI_COMMAND_MASTER_ENABLE; - pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, command); - command = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG); #ifdef SIS_USEIOSPACE if (pci_mapreg_map(pa, SIS_PCI_LOIO, PCI_MAPREG_TYPE_IO, 0, |