svn commit: r193054 - user/kmacy/releng_7_2_fcs/sys/amd64/conf

[Kip Macy]

Author: kmacy
Date: Fri May 29 19:42:32 2009
New Revision: 193054
URL: http://svn.freebsd.org/changeset/base/193054

Log:
  update to include USB and drm for desktop

Modified:
  user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC

Modified: user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC	Fri May 29 19:37:17 2009	(r193053)
+++ user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC	Fri May 29 19:42:32 2009	(r193054)
@@ -25,7 +25,7 @@ ident		GENERIC
 #hints		"GENERIC.hints"		# Default places to look for devices.
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-makeoptions	MODULES_OVERRIDE="mxge zlib geom opensolaris zfs cxgb fxp nfe hwpmc linux linprocfs"
+makeoptions	MODULES_OVERRIDE="geom opensolaris zfs cxgb fxp nfe hwpmc linux linprocfs drm"
 
 makeoptions	OPENSOLARIS
 options		OPENSOLARIS
@@ -207,19 +207,19 @@ device		firmware	# firmware assist modul
 device		bpf		# Berkeley packet filter
 
 # USB support
-#device		uhci		# UHCI PCI->USB interface
-#device		ohci		# OHCI PCI->USB interface
-#device		ehci		# EHCI PCI->USB interface (USB 2.0)
-#device		usb		# USB Bus (required)
-#device		udbp		# USB Double Bulk Pipe devices
-#device		ugen		# Generic
-#device		uhid		# "Human Interface Devices"
-#device		ukbd		# Keyboard
-#device		ulpt		# Printer
-#device		umass		# Disks/Mass storage - Requires scbus and da
-#device		ums		# Mouse
+device		uhci		# UHCI PCI->USB interface
+device		ohci		# OHCI PCI->USB interface
+device		ehci		# EHCI PCI->USB interface (USB 2.0)
+device		usb		# USB Bus (required)
+device		ugen		# Generic
+device		uhid		# "Human Interface Devices"
+device		ukbd		# Keyboard
+device		ulpt		# Printer
+device		umass		# Disks/Mass storage - Requires scbus and da
+device		ums		# Mouse
 #device		urio		# Diamond Rio 500 MP3 player
 #device		uscanner	# Scanners
+#device		udbp		# USB Double Bulk Pipe devices
 # USB Serial devices
 #device		ucom		# Generic com ttys
 #device		uark		# Technologies ARK3116 based serial adapters
@@ -238,3 +238,4 @@ options		ALT_BREAK_TO_DEBUGGER
 options		HWPMC_HOOKS
 options		LOCK_PROFILING
 device		mxge
+