Hi Dave,
Today's linux-next merge of the net tree got a conflict in
drivers/net/hp-plus.c between commit
1d71da164d7fb40fac72c0406a4a531265916fc8 ("net: hp-plus uses eip_poll")
from the net-current tree and commit
d4a97d425c2f59849ebdcc94281ecf108818efbf ("hp-plus: convert to
net_device_ops") from the net tree.
The fixed it up (see below) but assume it will be fixed soon in the net
tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/net/hp-plus.c
index c01e290,c34411c..0000000
--- a/drivers/net/hp-plus.c
+++ b/drivers/net/hp-plus.c
@@@ -158,6 -158,21 +158,21 @@@ out
}
#endif
+ static const struct net_device_ops hpp_netdev_ops = {
+ .ndo_open = hpp_open,
+ .ndo_stop = hpp_close,
+ .ndo_start_xmit = ei_start_xmit,
+ .ndo_tx_timeout = ei_tx_timeout,
+ .ndo_get_stats = ei_get_stats,
+ .ndo_set_multicast_list = ei_set_multicast_list,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_change_mtu = eth_change_mtu,
+ #ifdef CONFIG_NET_POLL_CONTROLLER
- .ndo_poll_controller = ei_poll,
++ .ndo_poll_controller = eip_poll,
+ #endif
+ };
+
+
/* Do the interesting part of the probe at a single address. */
static int __init hpp_probe1(struct net_device *dev, int ioaddr)
{
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
