From owner-p4-projects@FreeBSD.ORG  Wed Apr 30 16:27:47 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4DF5E37B404; Wed, 30 Apr 2003 16:27:47 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F05B637B401
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 16:27:46 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9C1D043F3F
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 16:27:46 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3UNRk0U059911
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 16:27:46 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UNRkek059906
	for perforce@freebsd.org; Wed, 30 Apr 2003 16:27:46 -0700 (PDT)
Date: Wed, 30 Apr 2003 16:27:46 -0700 (PDT)
Message-Id: <200304302327.h3UNRkek059906@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 30184 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Apr 2003 23:27:48 -0000

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

Change 30184 by peter@peter_daintree on 2003/04/30 16:26:51

	Oh that was clever.  I accidently deleted the master copies of the
	files/options/etc stuff. :-(

Affected files ...

.. //depot/projects/hammer/sys/conf/options.amd64#5 edit

Differences ...

==== //depot/projects/hammer/sys/conf/options.amd64#5 (text+ko) ====

@@ -32,6 +32,7 @@
 SC_RENDER_DEBUG		opt_syscons.h
 SC_TWOBUTTON_MOUSE	opt_syscons.h
 SC_NO_SUSPEND_VTYSWITCH	opt_syscons.h
+DEV_SPLASH		opt_splash.h
 
 VGA_ALT_SEQACCESS	opt_vga.h
 VGA_DEBUG		opt_vga.h
@@ -40,9 +41,6 @@
 VGA_SLOW_IOACCESS	opt_vga.h
 VGA_WIDTH90		opt_vga.h
 
-VESA
-VESA_DEBUG		opt_vesa.h
-
 ATKBD_DFLT_KEYMAP	opt_atkbd.h
 
 KBD_DISABLE_KEYMAP_LOAD	opt_kbd.h
@@ -55,3 +53,9 @@
 # -------------------------------
 # EOF
 # -------------------------------
+HAMMER			opt_cpu.h
+PPC_PROBE_CHIPSET	opt_ppc.h
+PPC_DEBUG		opt_ppc.h
+PSM_HOOKRESUME		opt_psm.h
+PSM_RESETAFTERSUSPEND	opt_psm.h
+PSM_DEBUG		opt_psm.h