[XFS] Fix merge failures

[pandora-kernel.git] / drivers / net / 8390.c

diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index 029ad08..fbe609a 100644 (file)
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -72,7 +72,16 @@ EXPORT_SYMBOL(ei_netdev_ops);
 
 struct net_device *__alloc_ei_netdev(int size)
 {
-       return ____alloc_ei_netdev(size);
+       struct net_device *dev = ____alloc_ei_netdev(size);
+#ifdef CONFIG_COMPAT_NET_DEV_OPS
+       if (dev) {
+               dev->hard_start_xmit = ei_start_xmit;
+               dev->get_stats  = ei_get_stats;
+               dev->set_multicast_list = ei_set_multicast_list;
+               dev->tx_timeout = ei_tx_timeout;
+       }
+#endif
+       return dev;
 }
 EXPORT_SYMBOL(__alloc_ei_netdev);