diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-24 13:34:40 -0500 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-24 13:34:40 -0500 |
commit | 8bd142c01648cdb33e9bcafa0448ba2c20ed814c (patch) | |
tree | 9197c60d3f9d4036f38f281a183e94750ceea1d7 /drivers/net/usb | |
parent | d792abacaf1a1a8dfea353fab699b97fa6251c2a (diff) | |
parent | fbb4574ce9a37e15a9872860bf202f2be5bdf6c4 (diff) |
Merge tag 'kvm-arm-for-v4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/ARM Fixes for v4.4-rc3.
Includes some timer fixes, properly unmapping PTEs, an errata fix, and two
tweaks to the EL2 panic code.
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/cdc_ether.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index c78d3cb1b464..3da70bf9936a 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c | |||
@@ -696,6 +696,11 @@ static const struct usb_device_id products[] = { | |||
696 | USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), | 696 | USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), |
697 | .driver_info = (kernel_ulong_t) &wwan_info, | 697 | .driver_info = (kernel_ulong_t) &wwan_info, |
698 | }, { | 698 | }, { |
699 | /* Dell DW5580 modules */ | ||
700 | USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, 0x81ba, USB_CLASS_COMM, | ||
701 | USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), | ||
702 | .driver_info = (kernel_ulong_t)&wwan_info, | ||
703 | }, { | ||
699 | USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ETHERNET, | 704 | USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ETHERNET, |
700 | USB_CDC_PROTO_NONE), | 705 | USB_CDC_PROTO_NONE), |
701 | .driver_info = (unsigned long) &cdc_info, | 706 | .driver_info = (unsigned long) &cdc_info, |