More non-emulating wsdisplay tentacles removal.

2 files changed, 2 insertions, 26 deletions

diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index 1fe3a31283e..22050d83220 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.63 2005/08/20 17:09:45 matthieu Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.64 2005/09/27 21:45:20 miod Exp $ */
 /* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */
 
 /*
@@ -590,20 +590,6 @@ wsemuldisplaydevprint(void *aux, const char *pnp)
 	return (UNCONF);
 }
 
-/* Print function (for parent devices). */
-int
-wsdisplaydevprint(void *aux, const char *pnp)
-{
-#if 0 /* -Wunused */
-	struct wsdisplaydev_attach_args *ap = aux;
-#endif
-
-	if (pnp)
-		printf("wsdisplay at %s", pnp);
-
-	return (UNCONF);
-}
-
 void
 wsdisplay_common_attach(struct wsdisplay_softc *sc, int console, int kbdmux,
     const struct wsscreen_list *scrdata,
diff --git a/sys/dev/wscons/wsdisplayvar.h b/sys/dev/wscons/wsdisplayvar.h
index 0a8e2e9f0cc..520fb9be4f4 100644
--- a/sys/dev/wscons/wsdisplayvar.h
+++ b/sys/dev/wscons/wsdisplayvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplayvar.h,v 1.15 2005/05/15 11:29:15 miod Exp $ */
+/* $OpenBSD: wsdisplayvar.h,v 1.16 2005/09/27 21:45:20 miod Exp $ */
 /* $NetBSD: wsdisplayvar.h,v 1.30 2005/02/04 02:10:49 perry Exp $ */
 
 /*
@@ -134,15 +134,6 @@ struct wsdisplay_accessops {
 	void	(*pollc)(void *, int);
 };
 
-/*
- * Attachment information provided by wsdisplaydev devices when attaching
- * wsdisplay units.
- */
-struct wsdisplaydev_attach_args {
-	const struct wsdisplay_accessops *accessops;	/* access ops */
-	void	*accesscookie;				/* access cookie */
-};
-
 /* passed to wscons by the video driver to tell about its capabilities */
 struct wsscreen_list {
 	int nscreens;
@@ -180,7 +171,6 @@ struct wscons_syncops {
  */
 void	wsdisplay_cnattach(const struct wsscreen_descr *, void *,
 				int, int, long);
-int	wsdisplaydevprint(void *, const char *);
 int	wsemuldisplaydevprint(void *, const char *);
 
 /*