diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 16:28:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 16:28:47 -0400 |
| commit | 2d986010ad13a00b83851238d52601d6092df40e (patch) | |
| tree | 6a43ffd30290fc051435643d485ad12fb1448ed5 /drivers/scsi/qlogicisp.c | |
| parent | 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (diff) | |
| parent | e10fb91c4dc81a4ae47caf0828df152f600f2546 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-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; |