diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 13:28:47 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 13:28:47 -0700 |
commit | 2d986010ad13a00b83851238d52601d6092df40e (patch) | |
tree | 6a43ffd30290fc051435643d485ad12fb1448ed5 /drivers/scsi/cpqfcTSinit.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/cpqfcTSinit.c')
-rw-r--r-- | drivers/scsi/cpqfcTSinit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/cpqfcTSinit.c b/drivers/scsi/cpqfcTSinit.c index 5674ada6d5c..d72be0ce89c 100644 --- a/drivers/scsi/cpqfcTSinit.c +++ b/drivers/scsi/cpqfcTSinit.c @@ -336,7 +336,6 @@ int cpqfcTS_detect(Scsi_Host_Template *ScsiHostTemplate) DEBUG_PCI(printk(" PciDev->baseaddress[3]= %lx\n", PciDev->resource[3].start)); - scsi_set_device(HostAdapter, &PciDev->dev); HostAdapter->irq = PciDev->irq; // copy for Scsi layers // HP Tachlite uses two (255-byte) ranges of Port I/O (lower & upper), |