diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-14 07:02:09 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-14 07:02:09 -0500 |
| commit | 704867ede0c3645075ff3438d1a4fd4977abaa8d (patch) | |
| tree | fc89b31764132dc1b07e0af3e53219005cfb8f95 /drivers/net/usb/cdc_ether.c | |
| parent | 681ba97d9fbff59f67c71f1d9a88ad0b8ef49d25 (diff) | |
| parent | cfe04478fa1b472264b7fe9bbf547710aa344d3c (diff) | |
Merge branch 'mfd/da9052' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into regmap-next
Diffstat (limited to 'drivers/net/usb/cdc_ether.c')
| -rw-r--r-- | drivers/net/usb/cdc_ether.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index c924ea2bce0..99ed6eb4dfa 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c | |||
| @@ -567,7 +567,7 @@ static const struct usb_device_id products [] = { | |||
| 567 | { | 567 | { |
| 568 | USB_DEVICE_AND_INTERFACE_INFO(0x1004, 0x61aa, USB_CLASS_COMM, | 568 | USB_DEVICE_AND_INTERFACE_INFO(0x1004, 0x61aa, USB_CLASS_COMM, |
| 569 | USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), | 569 | USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), |
| 570 | .driver_info = (unsigned long)&wwan_info, | 570 | .driver_info = 0, |
| 571 | }, | 571 | }, |
| 572 | 572 | ||
| 573 | /* | 573 | /* |