Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[pandora-kernel.git] / drivers / scsi / mac_scsi.c

diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index 777f9bc..cdbcaa5 100644 (file)
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -36,7 +36,6 @@
 
 #include <linux/module.h>
 #include <linux/signal.h>
-#include <linux/sched.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/blkdev.h>
@@ -65,9 +64,6 @@
 #define RESET_BOOT
 #define DRIVER_SETUP
 
-#define        ENABLE_IRQ()    mac_enable_irq( IRQ_MAC_SCSI ); 
-#define        DISABLE_IRQ()   mac_disable_irq( IRQ_MAC_SCSI );
-
 extern void via_scsi_clear(void);
 
 #ifdef RESET_BOOT
@@ -351,7 +347,7 @@ static void mac_scsi_reset_boot(struct Scsi_Host *instance)
        printk(KERN_INFO "Macintosh SCSI: resetting the SCSI bus..." );
 
        /* switch off SCSI IRQ - catch an interrupt without IRQ bit set else */
-       mac_disable_irq(IRQ_MAC_SCSI);
+       disable_irq(IRQ_MAC_SCSI);
 
        /* get in phase */
        NCR5380_write( TARGET_COMMAND_REG,
@@ -369,7 +365,7 @@ static void mac_scsi_reset_boot(struct Scsi_Host *instance)
                barrier();
 
        /* switch on SCSI IRQ again */
-       mac_enable_irq(IRQ_MAC_SCSI);
+       enable_irq(IRQ_MAC_SCSI);
 
        printk(KERN_INFO " done\n" );
 }