diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:42:23 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:42:23 -0400 |
| commit | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (patch) | |
| tree | 4c94e70ab846ffcb8bb5715fb3c8d8473358a323 /drivers/scsi/NCR5380.h | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
| parent | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (diff) | |
merge by hand (fix up qla_os.c merge error)
Diffstat (limited to 'drivers/scsi/NCR5380.h')
| -rw-r--r-- | drivers/scsi/NCR5380.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h index b5103f94d627..c3462e358d1c 100644 --- a/drivers/scsi/NCR5380.h +++ b/drivers/scsi/NCR5380.h | |||
| @@ -306,8 +306,6 @@ static void NCR5380_print(struct Scsi_Host *instance); | |||
| 306 | #endif | 306 | #endif |
| 307 | static int NCR5380_abort(Scsi_Cmnd * cmd); | 307 | static int NCR5380_abort(Scsi_Cmnd * cmd); |
| 308 | static int NCR5380_bus_reset(Scsi_Cmnd * cmd); | 308 | static int NCR5380_bus_reset(Scsi_Cmnd * cmd); |
| 309 | static int NCR5380_host_reset(Scsi_Cmnd * cmd); | ||
| 310 | static int NCR5380_device_reset(Scsi_Cmnd * cmd); | ||
| 311 | static int NCR5380_queue_command(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)); | 309 | static int NCR5380_queue_command(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)); |
| 312 | static int NCR5380_proc_info(struct Scsi_Host *instance, char *buffer, char **start, | 310 | static int NCR5380_proc_info(struct Scsi_Host *instance, char *buffer, char **start, |
| 313 | off_t offset, int length, int inout); | 311 | off_t offset, int length, int inout); |