diff options
Diffstat (limited to 'drivers/net/usb/usbnet.c')
| -rw-r--r-- | drivers/net/usb/usbnet.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index acd5f1c0e63a..8ed1fc5cbc70 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
| @@ -683,9 +683,6 @@ done_nopm: | |||
| 683 | * they'll probably want to use this base set. | 683 | * they'll probably want to use this base set. |
| 684 | */ | 684 | */ |
| 685 | 685 | ||
| 686 | #if defined(CONFIG_MII) || defined(CONFIG_MII_MODULE) | ||
| 687 | #define HAVE_MII | ||
| 688 | |||
| 689 | int usbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd) | 686 | int usbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd) |
| 690 | { | 687 | { |
| 691 | struct usbnet *dev = netdev_priv(net); | 688 | struct usbnet *dev = netdev_priv(net); |
| @@ -744,8 +741,6 @@ int usbnet_nway_reset(struct net_device *net) | |||
| 744 | } | 741 | } |
| 745 | EXPORT_SYMBOL_GPL(usbnet_nway_reset); | 742 | EXPORT_SYMBOL_GPL(usbnet_nway_reset); |
| 746 | 743 | ||
| 747 | #endif /* HAVE_MII */ | ||
| 748 | |||
| 749 | void usbnet_get_drvinfo (struct net_device *net, struct ethtool_drvinfo *info) | 744 | void usbnet_get_drvinfo (struct net_device *net, struct ethtool_drvinfo *info) |
| 750 | { | 745 | { |
| 751 | struct usbnet *dev = netdev_priv(net); | 746 | struct usbnet *dev = netdev_priv(net); |
| @@ -776,12 +771,10 @@ EXPORT_SYMBOL_GPL(usbnet_set_msglevel); | |||
| 776 | 771 | ||
| 777 | /* drivers may override default ethtool_ops in their bind() routine */ | 772 | /* drivers may override default ethtool_ops in their bind() routine */ |
| 778 | static struct ethtool_ops usbnet_ethtool_ops = { | 773 | static struct ethtool_ops usbnet_ethtool_ops = { |
| 779 | #ifdef HAVE_MII | ||
| 780 | .get_settings = usbnet_get_settings, | 774 | .get_settings = usbnet_get_settings, |
| 781 | .set_settings = usbnet_set_settings, | 775 | .set_settings = usbnet_set_settings, |
| 782 | .get_link = usbnet_get_link, | 776 | .get_link = usbnet_get_link, |
| 783 | .nway_reset = usbnet_nway_reset, | 777 | .nway_reset = usbnet_nway_reset, |
| 784 | #endif | ||
| 785 | .get_drvinfo = usbnet_get_drvinfo, | 778 | .get_drvinfo = usbnet_get_drvinfo, |
| 786 | .get_msglevel = usbnet_get_msglevel, | 779 | .get_msglevel = usbnet_get_msglevel, |
| 787 | .set_msglevel = usbnet_set_msglevel, | 780 | .set_msglevel = usbnet_set_msglevel, |
