2 files changed, 21 insertions, 8 deletions

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 1a758dc4394..35fbe12473d 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -124,7 +124,7 @@ obj-$(CONFIG_NE3210) += ne3210.o 8390.o
 obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o
 obj-$(CONFIG_B44) += b44.o
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
-obj-$(CONFIG_NE_H8300) += ne-h8300.o
+obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
 obj-$(CONFIG_AX88796) += ax88796.o
 
 obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
diff --git a/drivers/net/ne-h8300.c b/drivers/net/ne-h8300.c
index aa99f5e09d3..b5723917104 100644
--- a/drivers/net/ne-h8300.c
+++ b/drivers/net/ne-h8300.c
@@ -167,7 +167,7 @@ static void cleanup_card(struct net_device *dev)
 #ifndef MODULE
 struct net_device * __init ne_probe(int unit)
 {
-        struct net_device *dev = ____alloc_ei_netdev(0);
+        struct net_device *dev = alloc_ei_netdev();
         int err;
 
         if (!dev)
@@ -193,6 +193,21 @@ out:
 }
 #endif
 
+static const struct net_device_ops ne_netdev_ops = {
+        .ndo_open               = ne_open,
+        .ndo_stop               = ne_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,
+#endif
+};
+
 static int __init ne_probe1(struct net_device *dev, int ioaddr)
 {
         int i;
@@ -319,11 +334,9 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
         ei_status.block_output = &ne_block_output;
         ei_status.get_8390_hdr = &ne_get_8390_hdr;
         ei_status.priv = 0;
-        dev->open = &ne_open;
-        dev->stop = &ne_close;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        dev->poll_controller = __ei_poll;
-#endif
+
+        dev->netdev_ops = &ne_netdev_ops;
+
         __NS8390_init(dev, 0);
 
         ret = register_netdev(dev);
@@ -624,7 +637,7 @@ int init_module(void)
         int err;
 
         for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
-                struct net_device *dev = ____alloc_ei_netdev(0);
+                struct net_device *dev = alloc_ei_netdev();
                 if (!dev)
                         break;
                 if (io[this_dev]) {