Date: Sun, 8 Aug 2010 19:08:00 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r211081 - stable/7/sys/dev/usb Message-ID: <201008081908.o78J80QE052650@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gavin Date: Sun Aug 8 19:07:59 2010 New Revision: 211081 URL: http://svn.freebsd.org/changeset/base/211081 Log: Fix mismerge in r211035. Pointy hat: me Modified: stable/7/sys/dev/usb/u3g.c Modified: stable/7/sys/dev/usb/u3g.c ============================================================================== --- stable/7/sys/dev/usb/u3g.c Sun Aug 8 17:03:23 2010 (r211080) +++ stable/7/sys/dev/usb/u3g.c Sun Aug 8 19:07:59 2010 (r211081) @@ -194,7 +194,7 @@ static const struct u3g_dev_type_s u3g_d {{ USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CGU628 }, U3GSP_HSDPA, U3GINIT_CMOTECH }, {{ USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_DISK }, U3GSP_HSDPA, U3GINIT_NONE }, /* OEM: Longcheer */ - { USB_VENDOR_LONGCHEER, USB_PRODUCT_LONGCHEER_WM66 }, U3GSP_HSDPA, U3GINIT_HUAWEI }, + {{ USB_VENDOR_LONGCHEER, USB_PRODUCT_LONGCHEER_WM66 }, U3GSP_HSDPA, U3GINIT_HUAWEI }, }; #define u3g_lookup(v, p) ((const struct u3g_dev_type_s *)usb_lookup(u3g_devs, v, p))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008081908.o78J80QE052650>