PERFORCE change 112726 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=112726

Change 112726 by peter at peter_overcee on 2007/01/10 20:24:01

	IFC @112724

Affected files ...

.. //depot/projects/hammer/sys/conf/NOTES#112 integrate
.. //depot/projects/hammer/sys/conf/options#99 integrate
.. //depot/projects/hammer/sys/dev/syscons/scvesactl.c#8 integrate
.. //depot/projects/hammer/sys/powerpc/conf/NOTES#3 integrate

Differences ...

==== //depot/projects/hammer/sys/conf/NOTES#112 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1405 2007/01/03 11:12:54 piso Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1406 2007/01/10 18:45:17 marius Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -1398,6 +1398,7 @@
 options 	SC_NO_CUTPASTE
 options 	SC_NO_FONT_LOADING
 options 	SC_NO_HISTORY
+options 	SC_NO_MODE_CHANGE
 options 	SC_NO_SYSMOUSE
 options 	SC_NO_SUSPEND_VTYSWITCH
 

==== //depot/projects/hammer/sys/conf/options#99 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.571 2007/01/03 11:12:54 piso Exp $
+# $FreeBSD: src/sys/conf/options,v 1.572 2007/01/10 18:45:17 marius Exp $
 #
 #        On the handling of kernel options
 #
@@ -707,6 +707,7 @@
 SC_NO_CUTPASTE		opt_syscons.h
 SC_NO_FONT_LOADING	opt_syscons.h
 SC_NO_HISTORY		opt_syscons.h
+SC_NO_MODE_CHANGE	opt_syscons.h
 SC_NO_SUSPEND_VTYSWITCH	opt_syscons.h
 SC_NO_SYSMOUSE		opt_syscons.h
 SC_NORM_ATTR		opt_syscons.h

==== //depot/projects/hammer/sys/dev/syscons/scvesactl.c#8 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/syscons/scvesactl.c,v 1.24 2006/05/17 09:33:07 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvesactl.c,v 1.25 2007/01/10 19:04:00 marius Exp $");
 
 #include "opt_vga.h"
 
@@ -148,4 +148,4 @@
 	return 0;
 }
 
-#endif	/* SC_NO_MODE_CHANGE */
+#endif /* VGA_NO_MODE_CHANGE */

==== //depot/projects/hammer/sys/powerpc/conf/NOTES#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/powerpc/conf/NOTES,v 1.6 2006/10/23 13:23:13 ru Exp $
+# $FreeBSD: src/sys/powerpc/conf/NOTES,v 1.7 2007/01/10 18:45:18 marius Exp $
 #
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
@@ -60,4 +60,5 @@
 nooption 	GDB
 nooption	PPC_DEBUG
 nooption	PPC_PROBE_CHIPSET
+nooption 	SC_NO_MODE_CHANGE
 nooption 	UKBD_DFLT_KEYMAP