Build modules from the main src/sys tree.

Tidy up some loose ends.. there were extra -I's being added to CFLAGS for
no reason.

2 files changed, 2 insertions, 71 deletions

diff --git a/sys/modules/syscons/blank/Makefile b/sys/modules/syscons/blank/Makefile
index de6aac4a1ed6..5dba5188b0d9 100644
--- a/sys/modules/syscons/blank/Makefile
+++ b/sys/modules/syscons/blank/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
+.PATH:	${.CURDIR}/../../../dev/syscons/blank
+
 KMOD=	blank_saver
 SRCS=	blank_saver.c
 NOMAN=
 
-CFLAGS+= -I${.CURDIR}/..
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/blank/blank_saver.c b/sys/modules/syscons/blank/blank_saver.c
deleted file mode 100644
index 960acca5a512..000000000000
--- a/sys/modules/syscons/blank/blank_saver.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 1995-1998 Søren Schmidt
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer,
- *    without modification, immediately at the beginning of the file.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/consio.h>
-#include <sys/fbio.h>
-
-#include <dev/fb/fbreg.h>
-#include <dev/fb/splashreg.h>
-#include <dev/syscons/syscons.h>
-
-static int
-blank_saver(video_adapter_t *adp, int blank)
-{
-	(*vidsw[adp->va_index]->blank_display)(adp,
-					       (blank) ? V_DISPLAY_BLANK
-						       : V_DISPLAY_ON);
-	return 0;
-}
-
-static int
-blank_init(video_adapter_t *adp)
-{
-	if ((*vidsw[adp->va_index]->blank_display)(adp, V_DISPLAY_ON) == 0)
-		return 0;
-	return ENODEV;
-}
-
-static int
-blank_term(video_adapter_t *adp)
-{
-	return 0;
-}
-
-static scrn_saver_t blank_module = {
-	"blank_saver", blank_init, blank_term, blank_saver, NULL,
-};
-
-SAVER_MODULE(blank_saver, blank_module);