From 86464aed71025541805e7b1515541aee89879e33 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 15 Feb 1999 02:15:32 +0000
Subject: Merge with Linux 2.2.1.

---
 drivers/net/eexpress.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'drivers/net/eexpress.c')

diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 057fe5b86..005c574df 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -97,6 +97,7 @@
 #include <asm/system.h>
 #include <asm/bitops.h>
 #include <asm/io.h>
+#include <asm/irq.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -506,7 +507,7 @@ static int eexp_xmit(struct sk_buff *buf, struct device *dev)
 	printk(KERN_DEBUG "%s: eexp_xmit()\n", dev->name);
 #endif
 
-	outb(SIRQ_dis|irqrmap[dev->irq],dev->base_addr+SET_IRQ);
+	disable_irq(dev->irq);
 
 	/* If dev->tbusy is set, all our tx buffers are full but the kernel
 	 * is calling us anyway.  Check that nothing bad is happening.
@@ -543,7 +544,7 @@ static int eexp_xmit(struct sk_buff *buf, struct device *dev)
 	        eexp_hw_tx_pio(dev,data,length);
 	}
 	dev_kfree_skb(buf);
-	outb(SIRQ_en|irqrmap[dev->irq],dev->base_addr+SET_IRQ);
+	enable_irq(dev->irq);
 	return 0;
 }
 
-- 
cgit v1.2.3