From owner-cvs-all  Sat Feb  1 18:51:53 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 7F4FF37B401; Sat,  1 Feb 2003 18:51:52 -0800 (PST)
Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 80F3243F3F; Sat,  1 Feb 2003 18:51:50 -0800 (PST)
	(envelope-from marcel@xcllnt.net)
Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201])
	by ns1.xcllnt.net (8.12.6/8.12.6) with ESMTP id h122poMW092632;
	Sat, 1 Feb 2003 18:51:50 -0800 (PST)
	(envelope-from marcel@piii.pn.xcllnt.net)
Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1])
	by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id h122poC1000733;
	Sat, 1 Feb 2003 18:51:50 -0800 (PST)
	(envelope-from marcel@dhcp01.pn.xcllnt.net)
Received: (from marcel@localhost)
	by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id h122pnx9000732;
	Sat, 1 Feb 2003 18:51:49 -0800 (PST)
	(envelope-from marcel)
Date: Sat, 1 Feb 2003 18:51:49 -0800
From: Marcel Moolenaar <marcel@xcllnt.net>
To: MIHIRA Sanpei Yoshiro <sanpei@FreeBSD.org>
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/dev/usb usbdevs.h usbdevs_data.h
Message-ID: <20030202025149.GA712@dhcp01.pn.xcllnt.net>
References: <20030202.111528.43036744.sanpei@sanpei.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20030202.111528.43036744.sanpei@sanpei.org>
User-Agent: Mutt/1.5.3i
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

On Sun, Feb 02, 2003 at 11:15:28AM +0900, MIHIRA Sanpei Yoshiro wrote:
> 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.

No worries.

BTW: Doesn't the module use the same files?

-- 
 Marcel Moolenaar	  USPA: A-39004		 marcel@xcllnt.net

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message