Commit 9910fa6d authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] bring I2O roughly back into line

There are some bits left to do but this folds in all the main stuff from
2.4 and 2.5 including Al's recent change
parent 787c3d92
This diff is collapsed.
...@@ -42,11 +42,11 @@ ...@@ -42,11 +42,11 @@
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/tqueue.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <asm/semaphore.h> #include <asm/semaphore.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/workqueue.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/reboot.h> #include <linux/reboot.h>
......
...@@ -45,9 +45,9 @@ ...@@ -45,9 +45,9 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/tqueue.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/workqueue.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
This diff is collapsed.
...@@ -14,15 +14,14 @@ ...@@ -14,15 +14,14 @@
#define I2O_SCSI_CAN_QUEUE 4 #define I2O_SCSI_CAN_QUEUE 4
#define I2O_SCSI_CMD_PER_LUN 6 #define I2O_SCSI_CMD_PER_LUN 6
extern int i2o_scsi_detect(Scsi_Host_Template *); static int i2o_scsi_detect(Scsi_Host_Template *);
extern const char *i2o_scsi_info(struct Scsi_Host *); static const char *i2o_scsi_info(struct Scsi_Host *);
extern int i2o_scsi_command(Scsi_Cmnd *); static int i2o_scsi_command(Scsi_Cmnd *);
extern int i2o_scsi_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); static int i2o_scsi_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
extern int i2o_scsi_abort(Scsi_Cmnd *); static int i2o_scsi_abort(Scsi_Cmnd *);
extern int i2o_scsi_reset(Scsi_Cmnd *, unsigned int); static int i2o_scsi_reset(Scsi_Cmnd *, unsigned int);
extern int i2o_scsi_bios_param(Disk *, struct block_device *, int *); static int i2o_scsi_bios_param(Disk *, struct block_device *, int *);
extern void i2o_scsi_setup(char *str, int *ints); static int i2o_scsi_release(struct Scsi_Host *host);
extern int i2o_scsi_release(struct Scsi_Host *host);
#define I2OSCSI { \ #define I2OSCSI { \
next: NULL, \ next: NULL, \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment