diff options
| author |   hayeswang <hayeswang@realtek.com> | 2014-01-15 10:42:16 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-01-14 18:48:54 -0800 |
| commit | c7de7dec2ff2528ec630c55e68c25bd9d972b677 (patch) | |
| tree | 3f1a03819a3effb74641ba8cd50c00002f5635f8 /drivers/net/usb/r815x.c | |
| parent | r8152: fix the warnings and a error from checkpatch.pl (diff) | |
| download | linux-dev-c7de7dec2ff2528ec630c55e68c25bd9d972b677.tar.xz linux-dev-c7de7dec2ff2528ec630c55e68c25bd9d972b677.zip | |
r8152: ecm and vendor modes coexist
Remove the limitation that the ecm and r8152 drivers couldn't coexist.
- Remove the devices from the blacklist of relative drivers.
- Remove usb_driver_set_configuration() from r8152 driver.
- Modify the id_table of the r8152 driver for the vendor mode only.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/usb/r815x.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/usb/r815x.c b/drivers/net/usb/r815x.c index 5fd2ca61d1e2..f0a8791b7636 100644 --- a/drivers/net/usb/r815x.c +++ b/drivers/net/usb/r815x.c @@ -216,21 +216,13 @@ static const struct usb_device_id products[] = { { USB_DEVICE_AND_INTERFACE_INFO(REALTEK_VENDOR_ID, 0x8152, USB_CLASS_COMM, USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), -#if defined(CONFIG_USB_RTL8152) || defined(CONFIG_USB_RTL8152_MODULE) - .driver_info = 0, -#else .driver_info = (unsigned long) &r8152_info, -#endif }, { USB_DEVICE_AND_INTERFACE_INFO(REALTEK_VENDOR_ID, 0x8153, USB_CLASS_COMM, USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), -#if defined(CONFIG_USB_RTL8152) || defined(CONFIG_USB_RTL8152_MODULE) - .driver_info = 0, -#else .driver_info = (unsigned long) &r8153_info, -#endif }, { }, /* END */ |