diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2015-11-15 20:30:53 -0800 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-11-15 20:31:29 -0800 |
| commit | 617f41836c17688141e1c66f4156c2084f8ca86d (patch) | |
| tree | e57d631bb3bb061a0ff2e99bc85f94bd1c30598f /drivers/net/usb/dm9601.c | |
| parent | 26add94cd535d1e000e7871fe69c7bb89e942d67 (diff) | |
| parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
Merge v4.4-rc1 into MTD development
Sync up with the upstream development.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/net/usb/dm9601.c')
| -rw-r--r-- | drivers/net/usb/dm9601.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index 6e9c344c7a20..0b4bdd39106b 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c @@ -258,7 +258,6 @@ static void dm9601_get_drvinfo(struct net_device *net, { /* Inherit standard device info */ usbnet_get_drvinfo(net, info); - info->eedump_len = DM_EEPROM_LEN; } static u32 dm9601_get_link(struct net_device *net) |