PERFORCE change 29576 for review

[Peter Wemm]

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

Change 29576 by peter at peter_daintree on 2003/04/23 18:41:42

	add back some devices for real hardware

Affected files ...

.. //depot/projects/hammer/sys/x86_64/conf/GENERIC#7 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/conf/GENERIC#7 (text+ko) ====

@@ -23,7 +23,7 @@
 ident		GENERIC
 maxusers	0
 
-#options 	INET
+options 	INET
 options		SCHED_4BSD
 options 	FFS
 options		SOFTUPDATES
@@ -34,27 +34,27 @@
 options	INVARIANTS
 options INVARIANT_SUPPORT
 
-#device	pci
-#device	miibus
-#device	bge
-#device	fxp
+device	pci
+device	miibus
+device	bge
+device	fxp
 
-#device		random		# Entropy device
-#device	loop
-#device	ether
+device		random		# Entropy device
+device	loop
+device	ether
 device	md
 
-#device	ata
-#device	atadisk
-#device		atapicd			# ATAPI CDROM drives
+device	ata
+device	atadisk
+device	atapicd			# ATAPI CDROM drives
 
 # USB support
-#device          uhci            # UHCI PCI->USB interface
-#device          ohci            # OHCI PCI->USB interface
-#device          usb             # USB Bus (required)
-#device          ugen            # Generic
-#device          uhid            # "Human Interface Devices"
-#device          ukbd            # Keyboard
+device          uhci            # UHCI PCI->USB interface
+device          ohci            # OHCI PCI->USB interface
+device          usb             # USB Bus (required)
+device          ugen            # Generic
+device          uhid            # "Human Interface Devices"
+device          ukbd            # Keyboard
 
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse