diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /drivers/scsi/qla2xxx | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla2xxx')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index ce32322f1e19..ce74a6025a07 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
| @@ -2347,8 +2347,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha) | |||
| 2347 | } | 2347 | } |
| 2348 | 2348 | ||
| 2349 | /* Remove device from the new list and add it to DB */ | 2349 | /* Remove device from the new list and add it to DB */ |
| 2350 | list_del(&fcport->list); | 2350 | list_move_tail(&fcport->list, &ha->fcports); |
| 2351 | list_add_tail(&fcport->list, &ha->fcports); | ||
| 2352 | 2351 | ||
| 2353 | /* Login and update database */ | 2352 | /* Login and update database */ |
| 2354 | qla2x00_fabric_dev_login(ha, fcport, &next_loopid); | 2353 | qla2x00_fabric_dev_login(ha, fcport, &next_loopid); |