Removed options MAXCONS & HARDFONT, they are no longer in use

(and havn't been for long, sigh)

8 files changed, 8 insertions, 52 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 7d0e903..f202ab1 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.249 1996/04/11 06:19:44 scrappy Exp $
+#	$Id: LINT,v 1.250 1996/04/22 19:40:25 nate Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -450,19 +450,6 @@ options		PCVT_SCANSET=2 		# IBM keyboards are non-std
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 
 #
-# Options for `sc':
-#
-# HARDFONTS allows the driver to load an ISO-8859-1 font to replace
-# the default font in your display adapter's memory.
-#
-options		HARDFONTS
-#
-# MAXCONS is maximum number of virtual consoles, no more than 16
-# default value: 12
-#
-options         MAXCONS=16
-
-#
 # This device is mandatory.
 #
 # The Numeric Processing eXtension is used to either enable the
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index ff307ae..d2b5ee6 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,9 +1,8 @@
-#	$Id: options.i386,v 1.9 1996/04/11 21:18:26 bde Exp $
+#	$Id: options.i386,v 1.10 1996/04/13 16:50:23 bde Exp $
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		opt_math_emulate.h
 GPL_MATH_EMULATE	opt_math_emulate.h
-MAXCONS			opt_syscons.h
 IBCS2			opt_ibcs2.h
 SHOW_BUSYBUFS		opt_machdep.h
 PANIC_REBOOT_WAIT_TIME	opt_machdep.h
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 367321d..9947f75 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,13 +25,12 @@
  * (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.143 1996/03/02 18:24:03 peter Exp $
+ *  $Id: syscons.c,v 1.144 1996/03/27 19:11:41 bde Exp $
  */
 
 #include "sc.h"
 #include "apm.h"
 #include "opt_ddb.h"
-#include "opt_syscons.h"
 
 #if NSC > 0
 #include <sys/param.h>
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 7d0e903..f202ab1 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.249 1996/04/11 06:19:44 scrappy Exp $
+#	$Id: LINT,v 1.250 1996/04/22 19:40:25 nate Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -450,19 +450,6 @@ options		PCVT_SCANSET=2 		# IBM keyboards are non-std
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 
 #
-# Options for `sc':
-#
-# HARDFONTS allows the driver to load an ISO-8859-1 font to replace
-# the default font in your display adapter's memory.
-#
-options		HARDFONTS
-#
-# MAXCONS is maximum number of virtual consoles, no more than 16
-# default value: 12
-#
-options         MAXCONS=16
-
-#
 # This device is mandatory.
 #
 # The Numeric Processing eXtension is used to either enable the
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 7d0e903..f202ab1 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.249 1996/04/11 06:19:44 scrappy Exp $
+#	$Id: LINT,v 1.250 1996/04/22 19:40:25 nate Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -450,19 +450,6 @@ options		PCVT_SCANSET=2 		# IBM keyboards are non-std
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 
 #
-# Options for `sc':
-#
-# HARDFONTS allows the driver to load an ISO-8859-1 font to replace
-# the default font in your display adapter's memory.
-#
-options		HARDFONTS
-#
-# MAXCONS is maximum number of virtual consoles, no more than 16
-# default value: 12
-#
-options         MAXCONS=16
-
-#
 # This device is mandatory.
 #
 # The Numeric Processing eXtension is used to either enable the
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index ff307ae..d2b5ee6 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,9 +1,8 @@
-#	$Id: options.i386,v 1.9 1996/04/11 21:18:26 bde Exp $
+#	$Id: options.i386,v 1.10 1996/04/13 16:50:23 bde Exp $
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		opt_math_emulate.h
 GPL_MATH_EMULATE	opt_math_emulate.h
-MAXCONS			opt_syscons.h
 IBCS2			opt_ibcs2.h
 SHOW_BUSYBUFS		opt_machdep.h
 PANIC_REBOOT_WAIT_TIME	opt_machdep.h
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index 367321d..9947f75 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,13 +25,12 @@
  * (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.143 1996/03/02 18:24:03 peter Exp $
+ *  $Id: syscons.c,v 1.144 1996/03/27 19:11:41 bde Exp $
  */
 
 #include "sc.h"
 #include "apm.h"
 #include "opt_ddb.h"
-#include "opt_syscons.h"
 
 #if NSC > 0
 #include <sys/param.h>
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c
index 367321d..9947f75 100644
--- a/sys/isa/syscons.c
+++ b/sys/isa/syscons.c
@@ -25,13 +25,12 @@
  * (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.143 1996/03/02 18:24:03 peter Exp $
+ *  $Id: syscons.c,v 1.144 1996/03/27 19:11:41 bde Exp $
  */
 
 #include "sc.h"
 #include "apm.h"
 #include "opt_ddb.h"
-#include "opt_syscons.h"
 
 #if NSC > 0
 #include <sys/param.h>