summaryrefslogtreecommitdiffstats
path: root/sys/dev/syscons/syscons.c
diff options
context:
space:
mode:
authorjlemon <jlemon@FreeBSD.org>1999-06-01 18:17:50 +0000
committerjlemon <jlemon@FreeBSD.org>1999-06-01 18:17:50 +0000
commitedc341f25c24f553b32736be13a91d350d25b6ea (patch)
treea9729d25d19155e7cb890a8730606f4630c4c1f7 /sys/dev/syscons/syscons.c
parenteb1a4be892a8369a6865ff3ca76a20d0a7954019 (diff)
downloadFreeBSD-src-edc341f25c24f553b32736be13a91d350d25b6ea.zip
FreeBSD-src-edc341f25c24f553b32736be13a91d350d25b6ea.tar.gz
Unifdef VM86
Reviewed by: silence on on -current
Diffstat (limited to 'sys/dev/syscons/syscons.c')
-rw-r--r--sys/dev/syscons/syscons.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 61b6830..df527fc 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: syscons.c,v 1.304 1999/05/30 16:51:42 phk Exp $
+ * $Id: syscons.c,v 1.305 1999/05/31 11:25:13 phk Exp $
*/
#include "sc.h"
@@ -37,7 +37,6 @@
#include "opt_devfs.h"
#ifdef __i386__
#include "opt_vesa.h"
-#include "opt_vm86.h"
#endif
#include "opt_syscons.h"
@@ -571,7 +570,7 @@ int
sc_attach_unit(int unit, int flags)
{
scr_stat *scp;
-#if defined(VESA) && defined(VM86)
+#if defined(VESA)
video_info_t info;
#endif
#ifdef DEVFS
@@ -596,7 +595,7 @@ sc_attach_unit(int unit, int flags)
/* initialize history buffer & pointers */
sc_alloc_history_buffer(scp, sc_history_size, 0, FALSE);
-#if defined(VESA) && defined(VM86)
+#if defined(VESA)
if ((sc_flags & VESA800X600)
&& ((*vidsw[scp->ad]->get_info)(scp->adp, M_VESA_800x600, &info) == 0)) {
#if NSPLASH > 0
@@ -610,7 +609,7 @@ sc_attach_unit(int unit, int flags)
splash_init(scp->adp, scsplash_callback);
#endif
}
-#endif /* VESA && VM86 */
+#endif /* VESA */
/* initialize cursor stuff */
if (!ISGRAPHSC(scp))
OpenPOWER on IntegriCloud