diff options
| author |   downsj <downsj@openbsd.org> | 1997-08-08 08:24:34 +0000 |
|---|---|---|
| committer | downsj <downsj@openbsd.org> | 1997-08-08 08:24:34 +0000 |
| commit | 9afd9728f092b0341042c9708bdacf165d8a8754 (patch) | |
| tree | 7960ca5fb42d07a43afc1ccdf55fc5abf31bf46d /sys/arch/sparc/dev/amd7930.c | |
| parent | Initialize hwreset. (diff) | |
| download | wireguard-openbsd-9afd9728f092b0341042c9708bdacf165d8a8754.tar.xz wireguard-openbsd-9afd9728f092b0341042c9708bdacf165d8a8754.zip | |
Mostly sync to NetBSD-current 970804.
GENERIC currently compiles and runs; some devices (isp) are not complete and
not yet enabled.
Diffstat (limited to 'sys/arch/sparc/dev/amd7930.c')
| -rw-r--r-- | sys/arch/sparc/dev/amd7930.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arch/sparc/dev/amd7930.c b/sys/arch/sparc/dev/amd7930.c index bb250924af1..998e89f5d1f 100644 --- a/sys/arch/sparc/dev/amd7930.c +++ b/sys/arch/sparc/dev/amd7930.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amd7930.c,v 1.8 1997/07/13 21:48:42 angelos Exp $ */ +/* $OpenBSD: amd7930.c,v 1.9 1997/08/08 08:24:37 downsj Exp $ */ /* $NetBSD: amd7930.c,v 1.10 1996/03/31 22:38:29 pk Exp $ */ /* @@ -304,8 +304,7 @@ amd7930attach(parent, self, args) pri = ra->ra_intr[0].int_pri; printf(" pri %d, softpri %d\n", pri, PIL_AUSOFT); amd = (volatile struct amd7930 *)(ra->ra_vaddr ? - ra->ra_vaddr : mapiodev(ra->ra_reg, 0, sizeof (*amd), - ca->ca_bustype)); + ra->ra_vaddr : mapiodev(ra->ra_reg, 0, sizeof (*amd))); sc->sc_map.mr_mmr1 = AMD_MMR1_GX | AMD_MMR1_GER | AMD_MMR1_GR | AMD_MMR1_STG; |