3 files changed, 5 insertions, 6 deletions

diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index fd5adcd5594..6d5a914b961 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -26,7 +26,6 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 
-#include <asm/macintosh.h>
 #include <asm/mac_via.h>
 
 #define CARDNAME "swim"
diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
index 70367d76fc8..f1b85561c65 100644
--- a/drivers/net/ethernet/natsemi/macsonic.c
+++ b/drivers/net/ethernet/natsemi/macsonic.c
@@ -142,8 +142,7 @@ static int macsonic_open(struct net_device* dev)
 {
         int retval;
 
-        retval = request_irq(dev->irq, sonic_interrupt, IRQ_FLG_FAST,
-                                "sonic", dev);
+        retval = request_irq(dev->irq, sonic_interrupt, 0, "sonic", dev);
         if (retval) {
                 printk(KERN_ERR "%s: unable to get IRQ %d.\n",
                                 dev->name, dev->irq);
@@ -154,8 +153,8 @@ static int macsonic_open(struct net_device* dev)
          * rupt as well, which must prevent re-entrance of the sonic handler.
          */
         if (dev->irq == IRQ_AUTO_3) {
-                retval = request_irq(IRQ_NUBUS_9, macsonic_interrupt,
-                                        IRQ_FLG_FAST, "sonic", dev);
+                retval = request_irq(IRQ_NUBUS_9, macsonic_interrupt, 0,
+                                     "sonic", dev);
                 if (retval) {
                         printk(KERN_ERR "%s: unable to get IRQ %d.\n",
                                         dev->name, IRQ_NUBUS_9);
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c
index 590ce1ef201..4ceeace8045 100644
--- a/drivers/scsi/mac_esp.c
+++ b/drivers/scsi/mac_esp.c
@@ -25,6 +25,7 @@
 #include <asm/dma.h>
 #include <asm/macints.h>
 #include <asm/macintosh.h>
+#include <asm/mac_via.h>
 
 #include <scsi/scsi_host.h>
 
@@ -149,7 +150,7 @@ static inline int mac_esp_wait_for_dreq(struct esp *esp)
 
         do {
                 if (mep->pdma_regs == NULL) {
-                        if (mac_irq_pending(IRQ_MAC_SCSIDRQ))
+                        if (via2_scsi_drq_pending())
                                 return 0;
                 } else {
                         if (nubus_readl(mep->pdma_regs) & 0x200)