diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-06-18 01:42:23 +0200 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-06-18 01:42:23 +0200 |
commit | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (patch) | |
tree | 4c94e70ab846ffcb8bb5715fb3c8d8473358a323 /drivers/scsi/seagate.h | |
parent | Linux 2.6.12 (diff) | |
parent | [SCSI] allow sleeping in ->eh_host_reset_handler() (diff) | |
download | linux-3237ee78fc00f786d5f5aec6f9310b0e39069f15.tar.xz linux-3237ee78fc00f786d5f5aec6f9310b0e39069f15.zip |
merge by hand (fix up qla_os.c merge error)
Diffstat (limited to 'drivers/scsi/seagate.h')
-rw-r--r-- | drivers/scsi/seagate.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/seagate.h b/drivers/scsi/seagate.h index e49e8ecfb54d..8889ff1a6b20 100644 --- a/drivers/scsi/seagate.h +++ b/drivers/scsi/seagate.h @@ -15,7 +15,5 @@ static int seagate_st0x_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); static int seagate_st0x_abort(Scsi_Cmnd *); static const char *seagate_st0x_info(struct Scsi_Host *); static int seagate_st0x_bus_reset(Scsi_Cmnd *); -static int seagate_st0x_device_reset(Scsi_Cmnd *); -static int seagate_st0x_host_reset(Scsi_Cmnd *); #endif /* _SEAGATE_H */ |