diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
| commit | c5fbc3966f48279dbebfde10248c977014aa9988 (patch) | |
| tree | 0a52f645d89f91952c26b215f460a4ba195ca42c /drivers/scsi/qlogicfc.c | |
| parent | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/scsi/qlogicfc.c')
| -rw-r--r-- | drivers/scsi/qlogicfc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/qlogicfc.c b/drivers/scsi/qlogicfc.c index ddf0f4277ee8..a4b3b3fd4815 100644 --- a/drivers/scsi/qlogicfc.c +++ b/drivers/scsi/qlogicfc.c | |||
| @@ -746,7 +746,6 @@ static int isp2x00_detect(Scsi_Host_Template * tmpt) | |||
| 746 | printk("qlogicfc%d : could not register host.\n", hosts); | 746 | printk("qlogicfc%d : could not register host.\n", hosts); |
| 747 | continue; | 747 | continue; |
| 748 | } | 748 | } |
| 749 | scsi_set_device(host, &pdev->dev); | ||
| 750 | host->max_id = QLOGICFC_MAX_ID + 1; | 749 | host->max_id = QLOGICFC_MAX_ID + 1; |
| 751 | host->max_lun = QLOGICFC_MAX_LUN; | 750 | host->max_lun = QLOGICFC_MAX_LUN; |
| 752 | hostdata = (struct isp2x00_hostdata *) host->hostdata; | 751 | hostdata = (struct isp2x00_hostdata *) host->hostdata; |