diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-05 05:29:52 +0100 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-05 05:29:52 +0100 |
| commit | 849a8924a6740ecbf9711e015beca69425f0c429 (patch) | |
| tree | 2bae44c5fb170a655696b7253eec7ee13c6fa437 /drivers/scsi/psi240i.c | |
| parent | [PATCH] nvidiafb: Geforce 7800 series support added (diff) | |
| parent | [SCSI] ips: Fix initialization bug with kdump (diff) | |
| download | linux-849a8924a6740ecbf9711e015beca69425f0c429.tar.xz linux-849a8924a6740ecbf9711e015beca69425f0c429.zip | |
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/psi240i.c')
| -rw-r--r-- | drivers/scsi/psi240i.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/psi240i.c b/drivers/scsi/psi240i.c index 0f576d4ad0dd..4322c95c995c 100644 --- a/drivers/scsi/psi240i.c +++ b/drivers/scsi/psi240i.c @@ -659,7 +659,7 @@ static int Psi240i_BiosParam (struct scsi_device *sdev, struct block_device *dev { POUR_DEVICE pdev; - pdev = &(HOSTDATA(sdev->host)->device[sdev->id]); + pdev = &(HOSTDATA(sdev->host)->device[sdev_id(sdev)]); geom[0] = pdev->heads; geom[1] = pdev->sectors; |