PERFORCE change 31663 for review

[Peter Wemm]

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

Change 31663 by peter at 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.