X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fixp2000%2Fixpdev.c;h=a4eccb11d6771b3199d9d08f6437956e051e8956;hb=6f95416ebe81b3ad63884538555efb81cb05749f;hp=fbc2d21020f4ee9ac2cca49a5b3b3d7764a9a9fe;hpb=5d4fe2c1ce83c3e967ccc1ba3d580c1a5603a866;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c
index fbc2d21020f..a4eccb11d67 100644
--- a/drivers/net/ixp2000/ixpdev.c
+++ b/drivers/net/ixp2000/ixpdev.c
@@ -9,7 +9,6 @@
  * (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
@@ -189,7 +188,7 @@ static void ixpdev_tx_complete(void)
 	}
 }
 
-static irqreturn_t ixpdev_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t ixpdev_interrupt(int irq, void *dev_id)
 {
 	u32 status;
 
@@ -236,7 +235,7 @@ static int ixpdev_open(struct net_device *dev)
 
 	if (!nds_open++) {
 		err = request_irq(IRQ_IXP2000_THDA0, ixpdev_interrupt,
-					SA_SHIRQ, "ixp2000_eth", nds);
+					IRQF_SHARED, "ixp2000_eth", nds);
 		if (err) {
 			nds_open--;
 			return err;