Date: Mon, 29 Nov 2010 16:39:02 +1300 From: Andrew Thompson <thompsa@FreeBSD.org> To: Dima Dorfman <dd@freebsd.org> Cc: svn-src-all@freebsd.org, src-committers@freebsd.org, Hans Petter Selasky <hselasky@freebsd.org> Subject: Re: svn commit: r215980 - in stable/8/sys/dev/usb: . quirk serial wlan Message-ID: <AANLkTikrh4h56j49riT7xx=eGqXGeU-pDmgjNFrz%2BU6a@mail.gmail.com> In-Reply-To: <m2mxosx3g7.fsf@crouton.trit.net> References: <201011280703.oAS73Llh067002@svn.freebsd.org> <m2mxosx3g7.fsf@crouton.trit.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On 29 November 2010 15:34, Dima Dorfman <dd@freebsd.org> wrote: > Andrew Thompson <thompsa@FreeBSD.org> writes: >> Author: thompsa >> Date: Sun Nov 28 07:03:21 2010 >> New Revision: 215980 >> URL: http://svn.freebsd.org/changeset/base/215980 >> >> Log: >> =A0 MFC r213804,213879,213880,214800 >> >> =A0 Add new device IDs. > ... >> Modified: stable/8/sys/dev/usb/serial/u3g.c >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- stable/8/sys/dev/usb/serial/u3g.c Sun Nov 28 06:43:39 2010 =A0 =A0 = =A0 =A0(r215979) >> +++ stable/8/sys/dev/usb/serial/u3g.c Sun Nov 28 07:03:21 2010 =A0 =A0 = =A0 =A0(r215980) >> @@ -285,11 +285,12 @@ static const struct usb_device_id u3g_de >> =A0 =A0 =A0 U3G_DEV(HUAWEI, E220BIS, U3GINIT_HUAWEI), >> =A0 =A0 =A0 U3G_DEV(HUAWEI, MOBILE, U3GINIT_HUAWEI), >> =A0 =A0 =A0 U3G_DEV(HUAWEI, E1752, U3GINIT_HUAWEISCSI), >> - =A0 =A0 U3G_DEV(HUAWEI, K3765_INIT, U3GINIT_HUAWEISCSI), >> + =A0 =A0 U3G_DEV(HUAWEI, K3765, U3GINIT_HUAWEI), > > This looks like a merge error. Both K3765 and K3765_INIT are supposed to > be listed, with different flags. Like how it is in -current: > > : % grep K3765 head/sys/dev/usb/serial/u3g.c > : =A0 =A0 =A0 U3G_DEV(HUAWEI, K3765, U3GINIT_HUAWEI), > : =A0 =A0 =A0 U3G_DEV(HUAWEI, K3765_INIT, U3GINIT_HUAWEISCSI), Should be fixed now, thanks for pointing it out.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTikrh4h56j49riT7xx=eGqXGeU-pDmgjNFrz%2BU6a>