From owner-p4-projects@FreeBSD.ORG Wed Jan 10 20:24:29 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D1D816A494; Wed, 10 Jan 2007 20:24:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2391416A501 for ; Wed, 10 Jan 2007 20:24:29 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 14B2713C465 for ; Wed, 10 Jan 2007 20:24:29 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0AKOSh5044160 for ; Wed, 10 Jan 2007 20:24:28 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0AKOSHF044155 for perforce@freebsd.org; Wed, 10 Jan 2007 20:24:28 GMT (envelope-from peter@freebsd.org) Date: Wed, 10 Jan 2007 20:24:28 GMT Message-Id: <200701102024.l0AKOSHF044155@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 112726 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jan 2007 20:24:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=112726 Change 112726 by peter@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 -__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