drivers/video/msm: update to new kernel

[safe/jmp/linux-2.6] / drivers / net / 8390p.c

diff --git a/drivers/net/8390p.c b/drivers/net/8390p.c
index da863c9..a2a64ea 100644 (file)
--- a/drivers/net/8390p.c
+++ b/drivers/net/8390p.c
@@ -22,7 +22,7 @@ int eip_close(struct net_device *dev)
 }
 EXPORT_SYMBOL(eip_close);
 
-int eip_start_xmit(struct sk_buff *skb, struct net_device *dev)
+netdev_tx_t eip_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        return __ei_start_xmit(skb, dev);
 }
@@ -79,14 +79,8 @@ EXPORT_SYMBOL(eip_netdev_ops);
 struct net_device *__alloc_eip_netdev(int size)
 {
        struct net_device *dev = ____alloc_ei_netdev(size);
-#ifdef CONFIG_COMPAT_NET_DEV_OPS
-       if (dev) {
-               dev->hard_start_xmit = eip_start_xmit;
-               dev->get_stats  = eip_get_stats;
-               dev->set_multicast_list = eip_set_multicast_list;
-               dev->tx_timeout = eip_tx_timeout;
-       }
-#endif
+       if (dev)
+               dev->netdev_ops = &eip_netdev_ops;
        return dev;
 }
 EXPORT_SYMBOL(__alloc_eip_netdev);
@@ -97,16 +91,15 @@ void NS8390p_init(struct net_device *dev, int startp)
 }
 EXPORT_SYMBOL(NS8390p_init);
 
-#if defined(MODULE)
-
-int init_module(void)
+static int __init NS8390p_init_module(void)
 {
        return 0;
 }
 
-void cleanup_module(void)
+static void __exit NS8390p_cleanup_module(void)
 {
 }
 
-#endif /* MODULE */
+module_init(NS8390p_init_module);
+module_exit(NS8390p_cleanup_module);
 MODULE_LICENSE("GPL");