don't attach bivideo.

This commit is contained in:
uch 2002-03-06 15:01:05 +00:00
parent 3d0f70f7fc
commit f35aa9c904
2 changed files with 20 additions and 4 deletions

View File

@ -1,7 +1,7 @@
/* $NetBSD: plumvideo.c,v 1.24 2002/02/19 14:21:47 uch Exp $ */
/* $NetBSD: plumvideo.c,v 1.25 2002/03/06 15:01:05 uch Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
* Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@ -38,6 +38,7 @@
#undef PLUMVIDEODEBUG
#include "plumohci.h" /* Plum2 OHCI shared memory allocated on V-RAM */
#include "bivideo.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -70,6 +71,9 @@
#include <dev/wscons/wsconsio.h>
#include <dev/hpc/hpcfbvar.h>
#include <dev/hpc/hpcfbio.h>
#if NBIVIDEO > 0
#include <dev/hpc/bivideovar.h>
#endif
#ifdef PLUMVIDEODEBUG
int plumvideo_debug = 1;
@ -218,6 +222,10 @@ plumvideo_attach(struct device *parent, struct device *self, void *aux)
ha.ha_dspconflist = &sc->sc_dspconf;
config_found(self, &ha, hpcfbprint);
#if NBIVIDEO > 0
/* bivideo is no longer need */
bivideo_dont_attach = 1;
#endif /* NBIVIDEO > 0 */
}
void

View File

@ -1,7 +1,7 @@
/* $NetBSD: tx3912video.c,v 1.25 2002/02/19 14:21:48 uch Exp $ */
/* $NetBSD: tx3912video.c,v 1.26 2002/03/06 15:01:06 uch Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
* Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@ -39,6 +39,7 @@
#define TX3912VIDEO_DEBUG
#include "hpcfb.h"
#include "bivideo.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -68,6 +69,9 @@
#include <dev/wscons/wsconsio.h>
#include <dev/hpc/hpcfbvar.h>
#include <dev/hpc/hpcfbio.h>
#if NBIVIDEO > 0
#include <dev/hpc/bivideovar.h>
#endif
#ifdef TX3912VIDEO_DEBUG
int tx3912video_debug = 1;
@ -196,6 +200,10 @@ tx3912video_attach(struct device *parent, struct device *self, void *aux)
ha.ha_dspconflist = &sc->sc_dspconf;
config_found(self, &ha, hpcfbprint);
#if NBIVIDEO > 0
/* bivideo is no longer need */
bivideo_dont_attach = 1;
#endif /* NBIVIDEO > 0 */
}
int