svn commit: r215980 - in stable/8/sys/dev/usb: . quirk serial wlan

[Dima Dorfman]

Andrew Thompson <thompsa at 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