summaryrefslogtreecommitdiff
path: root/sys/arch/sparc/dev/bwtwo.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1995-11-09 21:34:48 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1995-11-09 21:34:48 +0000
commit1848f3689607781a442c3f9b95448510997e5fb3 (patch)
tree6818afd25264ca9160582f988cf6c492a1c04744 /sys/arch/sparc/dev/bwtwo.c
parent605f25f01edaf6c5fa838f1ba154e4b2b4856ed0 (diff)
correct sun4 calls to fb_attach()
Diffstat (limited to 'sys/arch/sparc/dev/bwtwo.c')
-rw-r--r--sys/arch/sparc/dev/bwtwo.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/arch/sparc/dev/bwtwo.c b/sys/arch/sparc/dev/bwtwo.c
index 76d14e39401..71c1b8fae70 100644
--- a/sys/arch/sparc/dev/bwtwo.c
+++ b/sys/arch/sparc/dev/bwtwo.c
@@ -236,11 +236,8 @@ bwtwoattach(parent, self, args)
if (ca->ca_bustype == BUS_SBUS)
sbus_establish(&sc->sc_sd, &sc->sc_dev);
#endif
- /*
- * XXX: this could cause a panic in fb_attach() if more
- * than one frame buffer device is found on a Sun 4.
- */
- if (node == fbnode || cputyp == CPU_SUN4)
+ if ((node == fbnode && cputyp != CPU_SUN4) ||
+ (isconsole && cputyp == CPU_SUN4))
fb_attach(&sc->sc_fb);
}