diff options
author | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 10:39:41 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 10:39:41 -0400 |
commit | fae6ec69c84d71b1d5bda9ede1a262c1681684aa (patch) | |
tree | eb4aff9a5c2b7d04ce09a3717bb1dd4a79fe7595 /drivers/scsi/NCR5380.h | |
parent | bbc0274e9bb2e3f1d724d445a2bd32566b9b66f7 (diff) | |
parent | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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); |