linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / a2065.c

diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index f4ea626..8e538a6 100644 (file)
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -48,6 +48,7 @@
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/crc32.h>
 #include <linux/zorro.h>
@@ -495,7 +496,7 @@ static int lance_open (struct net_device *dev)
        ll->rdp = LE_C0_STOP;
 
        /* Install the Interrupt handler */
-       ret = request_irq(IRQ_AMIGA_PORTS, lance_interrupt, IRQF_SHARED,
+       ret = request_irq(IRQ_AMIGA_PORTS, lance_interrupt, SA_SHIRQ,
                          dev->name, dev);
        if (ret) return ret;
 
@@ -572,7 +573,8 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)
        
        if (len < ETH_ZLEN) {
                len = ETH_ZLEN;
-               if (skb_padto(skb, ETH_ZLEN))
+               skb = skb_padto(skb, ETH_ZLEN);
+               if (skb == NULL)
                        return 0;
        }
 
@@ -827,7 +829,7 @@ static void __devexit a2065_remove_one(struct zorro_dev *z)
 
 static int __init a2065_init_module(void)
 {
-       return zorro_register_driver(&a2065_driver);
+       return zorro_module_init(&a2065_driver);
 }
 
 static void __exit a2065_cleanup_module(void)