Date: Sun, 28 Nov 2010 21:34:48 -0500 From: Dima Dorfman <dd@freebsd.org> To: Andrew Thompson <thompsa@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: <m2mxosx3g7.fsf@crouton.trit.net> In-Reply-To: <201011280703.oAS73Llh067002@svn.freebsd.org> (Andrew Thompson's message of "Sun, 28 Nov 2010 07:03:21 %2B0000 (UTC)") References: <201011280703.oAS73Llh067002@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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: > MFC r213804,213879,213880,214800 > > Add new device IDs. ... > Modified: stable/8/sys/dev/usb/serial/u3g.c > ============================================================================== > --- stable/8/sys/dev/usb/serial/u3g.c Sun Nov 28 06:43:39 2010 (r215979) > +++ stable/8/sys/dev/usb/serial/u3g.c Sun Nov 28 07:03:21 2010 (r215980) > @@ -285,11 +285,12 @@ static const struct usb_device_id u3g_de > U3G_DEV(HUAWEI, E220BIS, U3GINIT_HUAWEI), > U3G_DEV(HUAWEI, MOBILE, U3GINIT_HUAWEI), > U3G_DEV(HUAWEI, E1752, U3GINIT_HUAWEISCSI), > - U3G_DEV(HUAWEI, K3765_INIT, U3GINIT_HUAWEISCSI), > + 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 : U3G_DEV(HUAWEI, K3765, U3GINIT_HUAWEI), : U3G_DEV(HUAWEI, K3765_INIT, U3GINIT_HUAWEISCSI), -- Dima
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?m2mxosx3g7.fsf>