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/cpqfcTSinit.c | |
| parent | edb3366703224d5d8df573ae698ccd6b488dc743 (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge /spare/repo/linux-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 5674ada6d5c2..d72be0ce89c8 100644 --- a/drivers/scsi/cpqfcTSinit.c +++ b/drivers/scsi/cpqfcTSinit.c | |||
| @@ -336,7 +336,6 @@ int cpqfcTS_detect(Scsi_Host_Template *ScsiHostTemplate) | |||
| 336 | DEBUG_PCI(printk(" PciDev->baseaddress[3]= %lx\n", | 336 | DEBUG_PCI(printk(" PciDev->baseaddress[3]= %lx\n", |
| 337 | PciDev->resource[3].start)); | 337 | PciDev->resource[3].start)); |
| 338 | 338 | ||
| 339 | scsi_set_device(HostAdapter, &PciDev->dev); | ||
| 340 | HostAdapter->irq = PciDev->irq; // copy for Scsi layers | 339 | HostAdapter->irq = PciDev->irq; // copy for Scsi layers |
| 341 | 340 | ||
| 342 | // HP Tachlite uses two (255-byte) ranges of Port I/O (lower & upper), | 341 | // HP Tachlite uses two (255-byte) ranges of Port I/O (lower & upper), |