summaryrefslogtreecommitdiff
path: root/sys/arch/sparc/dev/amd7930.c
diff options
context:
space:
mode:
authorJason Downs <downsj@cvs.openbsd.org>1996-08-12 02:10:36 +0000
committerJason Downs <downsj@cvs.openbsd.org>1996-08-12 02:10:36 +0000
commitdbf76d3a599bdd84e083a43f0841940b52064af1 (patch)
treed7b18489dd7c3a92d6187dc58fdc34cb11eedcdb /sys/arch/sparc/dev/amd7930.c
parent64928d3f68a7e04c027b828b5e3c748b4405c921 (diff)
Revert part of that last change; mapdev()/mapiodev() should be done all at
once.
Diffstat (limited to 'sys/arch/sparc/dev/amd7930.c')
-rw-r--r--sys/arch/sparc/dev/amd7930.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/sparc/dev/amd7930.c b/sys/arch/sparc/dev/amd7930.c
index 2998ddbf603..a059d98c1a7 100644
--- a/sys/arch/sparc/dev/amd7930.c
+++ b/sys/arch/sparc/dev/amd7930.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: amd7930.c,v 1.5 1996/08/12 01:19:38 downsj Exp $ */
+/* $OpenBSD: amd7930.c,v 1.6 1996/08/12 02:10:35 downsj Exp $ */
/* $NetBSD: amd7930.c,v 1.10 1996/03/31 22:38:29 pk Exp $ */
/*
@@ -306,8 +306,9 @@ 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));
+ amd = (volatile struct amd7930 *)(ra->ra_vaddr ?
+ ra->ra_vaddr : mapiodev(ra->ra_reg, 0, sizeof (*amd),
+ ca->ca_bustype));
sc->sc_map.mr_mmr1 = AMD_MMR1_GX | AMD_MMR1_GER |
AMD_MMR1_GR | AMD_MMR1_STG;