diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-14 23:20:19 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-14 23:20:19 +0100 |
| commit | 099c2e9ef671519d4c7f9d49782845adc4f54a39 (patch) | |
| tree | 6b2f2bed35151959b278d687a71c904da61cce17 /drivers/usb/serial/zte_ev.c | |
| parent | Merge tag 'mvebu-fixes-3.13' of git://git.infradead.org/linux-mvebu into next... (diff) | |
| parent | ARM: OMAP2+: gpmc: Move legacy GPMC width setting (diff) | |
| download | linux-099c2e9ef671519d4c7f9d49782845adc4f54a39.tar.xz linux-099c2e9ef671519d4c7f9d49782845adc4f54a39.zip | |
Merge tag 'omap-for-v3.14/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
From Tony Lindgren:
Some non-urgent fixes to enable am335x features, update documentation,
and to remove unnecessary double initialization for the GPMC code.
* tag 'omap-for-v3.14/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (238 commits)
ARM: OMAP2+: gpmc: Move legacy GPMC width setting
ARM: OMAP2+: gpmc: Introduce gpmc_set_legacy()
ARM: OMAP2+: gpmc: Move initialization outside the gpmc_t condition
ARM: OMAP2+: board-generic: update SoC compatibility strings
Documentation: dt: OMAP: explicitly state SoC compatible strings
ARM: OMAP2+: enable AM33xx SOC EVM audio
ARM: OMAP2+: Select USB PHY for AM335x SoC
+Linux 3.13-rc5
Diffstat (limited to 'drivers/usb/serial/zte_ev.c')
| -rw-r--r-- | drivers/usb/serial/zte_ev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/zte_ev.c b/drivers/usb/serial/zte_ev.c index fca4c752a4ed..eae2c873b39f 100644 --- a/drivers/usb/serial/zte_ev.c +++ b/drivers/usb/serial/zte_ev.c @@ -281,8 +281,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x19d2, 0xfffd) }, { USB_DEVICE(0x19d2, 0xfffc) }, { USB_DEVICE(0x19d2, 0xfffb) }, - /* AC2726, AC8710_V3 */ - { USB_DEVICE_AND_INTERFACE_INFO(0x19d2, 0xfff1, 0xff, 0xff, 0xff) }, + /* AC8710_V3 */ { USB_DEVICE(0x19d2, 0xfff6) }, { USB_DEVICE(0x19d2, 0xfff7) }, { USB_DEVICE(0x19d2, 0xfff8) }, |