From owner-p4-projects@FreeBSD.ORG  Thu May 22 19:14:38 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 624D037B404; Thu, 22 May 2003 19:14:37 -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 0F4AE37B401
	for <perforce@freebsd.org>; Thu, 22 May 2003 19:14:37 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AD21C43F85
	for <perforce@freebsd.org>; Thu, 22 May 2003 19:14:36 -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 h4N2Ea0U097030
	for <perforce@freebsd.org>; Thu, 22 May 2003 19:14:36 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N2Ea9x097027
	for perforce@freebsd.org; Thu, 22 May 2003 19:14:36 -0700 (PDT)
Date: Thu, 22 May 2003 19:14:36 -0700 (PDT)
Message-Id: <200305230214.h4N2Ea9x097027@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 31663 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: Fri, 23 May 2003 02:14:38 -0000

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

Change 31663 by peter@peter_hammer on 2003/05/22 19:14:29

	Revert accidental deletion of syscons etc.

Affected files ...

.. //depot/projects/hammer/sys/amd64/conf/GENERIC#12 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/conf/GENERIC#12 (text+ko) ====

@@ -59,18 +59,18 @@
 options	KTRACE
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-#device		atkbdc		# AT keyboard controller
-#device		atkbd		# AT keyboard
-#device		psm		# PS/2 mouse
+device		atkbdc		# AT keyboard controller
+device		atkbd		# AT keyboard
+device		psm		# PS/2 mouse
 
-#device		vga		# VGA video card driver
+device		vga		# VGA video card driver
 
-#device		splash		# Splash screen and screen saver support
+device		splash		# Splash screen and screen saver support
 
 # syscons is the default console driver, resembling an SCO console
-#device		sc
+device		sc
 
-##device		agp		# support several AGP chipsets
+#device		agp		# support several AGP chipsets
 
 # Serial (COM) ports
 device		sio		# 8250, 16[45]50 based serial ports
@@ -84,7 +84,7 @@
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		miibus		# MII bus support
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
-#device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
+device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 device		bge		# Broadcom BCM570xx Gigabit Ethernet
 
 # Pseudo devices - the number indicates how many units to allocate.