From 30dbb3eabc13d644384846a2e4d77429b9495f08 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 30 Jun 2014 16:18:38 +0000
Subject: [PATCH] Add vt(4) to GENERIC and retire the separate VT config

vt(4) and sc(4) can now coexist in the same kernel.  To choose the vt
driver, set the loader tunable kern.vty=vt .
---
 sys/amd64/conf/GENERIC |  5 +++++
 sys/amd64/conf/VT      | 15 ---------------
 sys/i386/conf/GENERIC  |  4 ++++
 sys/i386/conf/VT       | 14 --------------
 4 files changed, 9 insertions(+), 29 deletions(-)
 delete mode 100644 sys/amd64/conf/VT
 delete mode 100644 sys/i386/conf/VT

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 3a41da340f4..42698896b40 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -184,6 +184,11 @@ device		splash			# Splash screen and screen saver support
 device		sc
 options 	SC_PIXEL_MODE		# add support for the raster text mode
 
+# vt is the new video console driver
+device		vt
+device		vt_vga
+device		vt_efifb
+
 device		agp			# support several AGP chipsets
 
 # PCCARD (PCMCIA) support
diff --git a/sys/amd64/conf/VT b/sys/amd64/conf/VT
deleted file mode 100644
index c11f1afa442..00000000000
--- a/sys/amd64/conf/VT
+++ /dev/null
@@ -1,15 +0,0 @@
-# VT -- kernel config using the vt(9) system console instead of legacy syscons
-#                                                                              
-# For more information see https://wiki.freebsd.org/Newcons
-#
-# $FreeBSD$
-
-include		GENERIC
-ident		VT
-
-nodevice	sc
-nodevice	vga
-
-device		vt
-device		vt_vga
-device		vt_efifb
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 3948bb20273..0cbf5c8c9e1 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -187,6 +187,10 @@ device		splash			# Splash screen and screen saver support
 device		sc
 options 	SC_PIXEL_MODE		# add support for the raster text mode
 
+# vt is the new video console driver
+device		vt
+device		vt_vga
+
 device		agp			# support several AGP chipsets
 
 # Power management support (see NOTES for more options)
diff --git a/sys/i386/conf/VT b/sys/i386/conf/VT
deleted file mode 100644
index 7d0547f1145..00000000000
--- a/sys/i386/conf/VT
+++ /dev/null
@@ -1,14 +0,0 @@
-# VT -- kernel config using the vt(9) system console instead of legacy syscons
-#                                                                              
-# For more information see https://wiki.freebsd.org/Newcons
-#
-# $FreeBSD$
-
-include		GENERIC
-ident		VT
-
-nodevice	sc
-nodevice	vga
-
-device		vt
-device		vt_vga