X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fnet%2F3c515.c;fp=drivers%2Fnet%2F3c515.c;h=91d1c4c24d9b9616799fa3cc7c171ad51f139e76;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=aedfddf20cb32c77302903affa7e5584659003d4;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index aedfddf20..91d1c4c24 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -57,6 +57,7 @@ static int max_interrupt_work = 20;
 #define RX_RING_SIZE	16
 #define PKT_BUF_SZ		1536	/* Size of each temporary Rx buffer. */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/isapnp.h>
 #include <linux/kernel.h>
@@ -760,7 +761,7 @@ static int corkscrew_open(struct net_device *dev)
 				   vp->product_name, dev)) return -EAGAIN;
 		enable_dma(dev->dma);
 		set_dma_mode(dev->dma, DMA_MODE_CASCADE);
-	} else if (request_irq(dev->irq, &corkscrew_interrupt, IRQF_SHARED,
+	} else if (request_irq(dev->irq, &corkscrew_interrupt, SA_SHIRQ,
 			       vp->product_name, dev)) {
 		return -EAGAIN;
 	}
@@ -1003,8 +1004,7 @@ static int corkscrew_start_xmit(struct sk_buff *skb,
 		/* Calculate the next Tx descriptor entry. */
 		int entry = vp->cur_tx % TX_RING_SIZE;
 		struct boom_tx_desc *prev_entry;
-		unsigned long flags;
-		int i;
+		unsigned long flags, i;
 
 		if (vp->tx_full)	/* No room to transmit with */
 			return 1;