diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
| commit | a2e30e529a48ef4e106e405f91cf4ae525bb01c4 (patch) | |
| tree | 2def96ef17c0672c30f1a10287552978bf1d0b1c /drivers/scsi/qlogicisp.c | |
| parent | edb3366703224d5d8df573ae698ccd6b488dc743 (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/qlogicisp.c')
| -rw-r--r-- | drivers/scsi/qlogicisp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/qlogicisp.c b/drivers/scsi/qlogicisp.c index 6d29e1b864e2..6c9266b8ffdf 100644 --- a/drivers/scsi/qlogicisp.c +++ b/drivers/scsi/qlogicisp.c | |||
| @@ -694,7 +694,6 @@ static int isp1020_detect(Scsi_Host_Template *tmpt) | |||
| 694 | memset(hostdata, 0, sizeof(struct isp1020_hostdata)); | 694 | memset(hostdata, 0, sizeof(struct isp1020_hostdata)); |
| 695 | 695 | ||
| 696 | hostdata->pci_dev = pdev; | 696 | hostdata->pci_dev = pdev; |
| 697 | scsi_set_device(host, &pdev->dev); | ||
| 698 | 697 | ||
| 699 | if (isp1020_init(host)) | 698 | if (isp1020_init(host)) |
| 700 | goto fail_and_unregister; | 699 | goto fail_and_unregister; |