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/in2000.h | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
| parent | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (diff) | |
merge by hand (fix up qla_os.c merge error)
Diffstat (limited to 'drivers/scsi/in2000.h')
| -rw-r--r-- | drivers/scsi/in2000.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/in2000.h b/drivers/scsi/in2000.h index 019e45df3016..a240b52554d8 100644 --- a/drivers/scsi/in2000.h +++ b/drivers/scsi/in2000.h | |||
| @@ -401,9 +401,7 @@ static int in2000_abort(Scsi_Cmnd *); | |||
| 401 | static void in2000_setup(char *, int *) in2000__INIT; | 401 | static void in2000_setup(char *, int *) in2000__INIT; |
| 402 | static int in2000_biosparam(struct scsi_device *, struct block_device *, | 402 | static int in2000_biosparam(struct scsi_device *, struct block_device *, |
| 403 | sector_t, int *); | 403 | sector_t, int *); |
| 404 | static int in2000_host_reset(Scsi_Cmnd *); | ||
| 405 | static int in2000_bus_reset(Scsi_Cmnd *); | 404 | static int in2000_bus_reset(Scsi_Cmnd *); |
| 406 | static int in2000_device_reset(Scsi_Cmnd *); | ||
| 407 | 405 | ||
| 408 | 406 | ||
| 409 | #define IN2000_CAN_Q 16 | 407 | #define IN2000_CAN_Q 16 |