From owner-svn-src-user@FreeBSD.ORG Fri May 29 19:42:32 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B22DD106564A; Fri, 29 May 2009 19:42:32 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 63EAB8FC22; Fri, 29 May 2009 19:42:32 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TJgWC1084648; Fri, 29 May 2009 19:42:32 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4TJgWGC084647; Fri, 29 May 2009 19:42:32 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200905291942.n4TJgWGC084647@svn.freebsd.org> From: Kip Macy Date: Fri, 29 May 2009 19:42:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193054 - user/kmacy/releng_7_2_fcs/sys/amd64/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2009 19:42:32 -0000 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 +