git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
92d2c83
..
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/module.h>
#include <linux/signal.h>
-#include <linux/sched.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/blkdev.h>
@@
-65,9
+64,6
@@
#define RESET_BOOT
#define DRIVER_SETUP
#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
extern void via_scsi_clear(void);
#ifdef RESET_BOOT
@@
-222,7
+218,7
@@
static struct Scsi_Host *default_instance;
#endif
/*
#endif
/*
- * Function : int macscsi_detect(
Scsi_Host_T
emplate * tpnt)
+ * Function : int macscsi_detect(
struct scsi_host_t
emplate * tpnt)
*
* Purpose : initializes mac NCR5380 driver based on the
* command line / compile time port and irq definitions.
*
* Purpose : initializes mac NCR5380 driver based on the
* command line / compile time port and irq definitions.
@@
-233,7
+229,7
@@
static struct Scsi_Host *default_instance;
*
*/
*
*/
-int macscsi_detect(
Scsi_Host_T
emplate * tpnt)
+int macscsi_detect(
struct scsi_host_t
emplate * tpnt)
{
static int called = 0;
int flags = 0;
{
static int called = 0;
int flags = 0;
@@
-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 */
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,
/* 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 */
barrier();
/* switch on SCSI IRQ again */
-
mac_
enable_irq(IRQ_MAC_SCSI);
+ enable_irq(IRQ_MAC_SCSI);
printk(KERN_INFO " done\n" );
}
printk(KERN_INFO " done\n" );
}
@@
-581,7
+577,7
@@
static int macscsi_pwrite (struct Scsi_Host *instance,
#include "NCR5380.c"
#include "NCR5380.c"
-static
Scsi_Host_T
emplate driver_template = {
+static
struct scsi_host_t
emplate driver_template = {
.proc_name = "Mac5380",
.proc_info = macscsi_proc_info,
.name = "Macintosh NCR5380 SCSI",
.proc_name = "Mac5380",
.proc_info = macscsi_proc_info,
.name = "Macintosh NCR5380 SCSI",