Remove 'option COMPAT_PCVT' now that X doen't use it anymore.

An X server built after april 3 is needed to be able to start X with
the new kernel.
ok kettenis@

2 files changed, 2 insertions, 22 deletions

diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c
index 3ebfef4b60a..f11933f1411 100644
--- a/sys/dev/wscons/wsdisplay_compat_usl.c
+++ b/sys/dev/wscons/wsdisplay_compat_usl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay_compat_usl.c,v 1.30 2016/03/28 09:08:22 matthieu Exp $ */
+/* $OpenBSD: wsdisplay_compat_usl.c,v 1.31 2016/04/24 17:30:31 matthieu Exp $ */
 /* $NetBSD: wsdisplay_compat_usl.c,v 1.12 2000/03/23 07:01:47 thorpej Exp $ */
 
 /*
@@ -321,16 +321,6 @@ wsdisplay_usl_ioctl1(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
 #undef ss
 		return (0);
 
-#ifdef WSDISPLAY_COMPAT_PCVT
-	    case VGAPCVTID:
-#define id ((struct pcvtid *)data)
-		strlcpy(id->name, "pcvt", sizeof id->name);
-		id->rmajor = 3;
-		id->rminor = 32;
-#undef id
-		return (0);
-#endif
-
 	    default:
 		return (-1);
 	}
diff --git a/sys/dev/wscons/wsdisplay_usl_io.h b/sys/dev/wscons/wsdisplay_usl_io.h
index 0748b8e4830..a6a6b9fad48 100644
--- a/sys/dev/wscons/wsdisplay_usl_io.h
+++ b/sys/dev/wscons/wsdisplay_usl_io.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay_usl_io.h,v 1.3 2016/03/03 18:00:49 naddy Exp $ */
+/* $OpenBSD: wsdisplay_usl_io.h,v 1.4 2016/04/24 17:30:31 matthieu Exp $ */
 /* $NetBSD: wsdisplay_usl_io.h,v 1.1 1998/06/11 22:00:04 drochner Exp $ */
 
 #define VT_OPENQRY	_IOR('v', 1, int)
@@ -68,13 +68,3 @@ struct kbentry {
 #define LED_SCR		4
 
 #define KDSETRAD	_IO('K', 67 /*, int */)
-
-/* pcvt compatibility */
-#define VGAPCVTID	_IOWR('V',113, struct pcvtid)	/* get driver id */
-
-struct pcvtid {
-#define PCVTIDNAMELN  16		/* driver id - string length	*/
-	char name[PCVTIDNAMELN];	/* driver name			*/
-	int rmajor;			/* revision number, major	*/
-	int rminor;			/* revision number, minor	*/
-};