From owner-p4-projects@FreeBSD.ORG Sun Sep 17 10:35:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D5C316A415; Sun, 17 Sep 2006 10:35:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 D0DDF16A403 for ; Sun, 17 Sep 2006 10:35:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F43B43D49 for ; Sun, 17 Sep 2006 10:35:38 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HAZcVk006203 for ; Sun, 17 Sep 2006 10:35:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HAZcGu006200 for perforce@freebsd.org; Sun, 17 Sep 2006 10:35:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 17 Sep 2006 10:35:38 GMT Message-Id: <200609171035.k8HAZcGu006200@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106232 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 10:35:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=106232 Change 106232 by hselasky@hselasky_mini_itx on 2006/09/17 10:35:02 Diff reduction against FreeBSD-7-current. Affected files ... .. //depot/projects/usb/src/sys/conf/files#7 edit Differences ... ==== //depot/projects/usb/src/sys/conf/files#7 (text+ko) ==== @@ -974,25 +974,8 @@ dev/ubsec/ubsec.c optional ubsec # # USB support -dev/usb/uhci.c optional uhci -dev/usb/uhci_pci.c optional uhci -dev/usb/ohci.c optional ohci -dev/usb/ohci_pci.c optional ohci dev/usb/ehci.c optional ehci -dev/usb/ehci_pci.c optional ehci -dev/usb/uhub.c optional usb -dev/usb/usb.c optional usb -dev/usb/usb_requests.c optional usb -dev/usb/usb_subr.c optional usb -dev/usb/usb_transfer.c optional usb -dev/usb/usb_if.m optional usb -dev/usb/usb_quirks.c optional usb -dev/usb/usb_hid.c optional usb -dev/usb/usb_cdev.c optional usb -dev/usb/ugen.c optional ugen -dev/usb/ulpt.c optional ulpt -dev/usb/ums.c optional ums -dev/usb/ukbd.c optional ukbd +dev/usb/ehci_pci.c optional ehci pci dev/usb/if_aue.c optional aue dev/usb/if_axe.c optional axe dev/usb/if_cdce.c optional cdce @@ -1001,9 +984,8 @@ dev/usb/if_ural.c optional ural dev/usb/if_rue.c optional rue dev/usb/if_udav.c optional udav -dev/usb/ufm.c optional ufm -# -# USB support (not merged) +dev/usb/ohci.c optional ohci +dev/usb/ohci_pci.c optional ohci pci dev/usb/sl811hs.c optional slhci dev/usb/slhci_pccard.c optional slhci pccard dev/usb/ubsa.c optional ubsa ucom @@ -1012,13 +994,29 @@ dev/usb/ucycom.c optional ucycom ucom dev/usb/udbp.c optional udbp dev/usb/ufoma.c optional ufoma ucom +dev/usb/ufm.c optional ufm dev/usb/uftdi.c optional uftdi ucom +dev/usb/ugen.c optional ugen +dev/usb/uhci.c optional uhci +dev/usb/uhci_pci.c optional uhci pci dev/usb/uhid.c optional uhid +dev/usb/uhub.c optional usb +dev/usb/ukbd.c optional ukbd +dev/usb/ulpt.c optional ulpt dev/usb/umass.c optional umass dev/usb/umct.c optional umct dev/usb/umodem.c optional umodem +dev/usb/ums.c optional ums dev/usb/uplcom.c optional uplcom ucom dev/usb/urio.c optional urio +dev/usb/usb.c optional usb +dev/usb/usb_cdev.c optional usb +dev/usb/usb_hid.c optional usb +dev/usb/usb_if.m optional usb +dev/usb/usb_quirks.c optional usb +dev/usb/usb_requests.c optional usb +dev/usb/usb_subr.c optional usb +dev/usb/usb_transfer.c optional usb dev/usb/uscanner.c optional uscanner dev/usb/uvisor.c optional uvisor ucom dev/usb/uvscom.c optional uvscom ucom