From owner-cvs-all Sat Feb 1 18:15:37 2003 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A209837B401; Sat, 1 Feb 2003 18:15:36 -0800 (PST) Received: from cherry.sanpei.org (cherry.as.wakwak.ne.jp [61.205.227.15]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AE1643F43; Sat, 1 Feb 2003 18:15:36 -0800 (PST) (envelope-from sanpei@FreeBSD.org) Received: from localhost (localhost [::1]) by cherry.sanpei.org (8.11.6/8.11.6) with ESMTP id h122FTm22234; Sun, 2 Feb 2003 11:15:29 +0900 (JST) (envelope-from sanpei@FreeBSD.org) Date: Sun, 02 Feb 2003 11:15:28 +0900 (JST) Message-Id: <20030202.111528.43036744.sanpei@sanpei.org> To: marcel@FreeBSD.org Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/dev/usb usbdevs.h usbdevs_data.h From: MIHIRA Sanpei Yoshiro X-Mailer: Mew version 3.1 on Emacs 21.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Hi. marcel. >marcel 2003/02/01 17:57:32 PST > > Modified files: > sys/dev/usb usbdevs > Log: > Unbreak kernel builds caused by what appears to be a merge conflict. > This change has been tested. > > Revision Changes Path > 1.110 +1 -2 src/sys/dev/usb/usbdevs Thanks. I only tested in /sys/modules/usb before commit. --- MIHIRA, Sanpei Yoshiro Tokyo, Japan. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message