diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-04 22:29:52 -0600 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-04 22:29:52 -0600 |
| commit | 849a8924a6740ecbf9711e015beca69425f0c429 (patch) | |
| tree | 2bae44c5fb170a655696b7253eec7ee13c6fa437 /drivers/scsi/sgiwd93.c | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
| parent | ee807c2d43b54183c16580857837dae8ccb2ed22 (diff) | |
Merge by Hand
Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/sgiwd93.c')
| -rw-r--r-- | drivers/scsi/sgiwd93.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c index a5ba2c692752..09fd203e4b86 100644 --- a/drivers/scsi/sgiwd93.c +++ b/drivers/scsi/sgiwd93.c @@ -33,7 +33,6 @@ #include "scsi.h" #include <scsi/scsi_host.h> #include "wd33c93.h" -#include "sgiwd93.h" #include <linux/stat.h> @@ -335,10 +334,10 @@ static Scsi_Host_Template driver_template = { .eh_abort_handler = wd33c93_abort, .eh_bus_reset_handler = sgiwd93_bus_reset, .eh_host_reset_handler = wd33c93_host_reset, - .can_queue = CAN_QUEUE, + .can_queue = 16, .this_id = 7, .sg_tablesize = SG_ALL, - .cmd_per_lun = CMD_PER_LUN, + .cmd_per_lun = 8, .use_clustering = DISABLE_CLUSTERING, }; #include "scsi_module.c" |