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/nsp32.c | |
| parent | edb3366703224d5d8df573ae698ccd6b488dc743 (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/nsp32.c')
| -rw-r--r-- | drivers/scsi/nsp32.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c index 5159ceea319e..6367f009cd74 100644 --- a/drivers/scsi/nsp32.c +++ b/drivers/scsi/nsp32.c | |||
| @@ -2719,9 +2719,7 @@ static int nsp32_detect(Scsi_Host_Template *sht) | |||
| 2719 | host->unique_id = data->BaseAddress; | 2719 | host->unique_id = data->BaseAddress; |
| 2720 | host->n_io_port = data->NumAddress; | 2720 | host->n_io_port = data->NumAddress; |
| 2721 | host->base = (unsigned long)data->MmioAddress; | 2721 | host->base = (unsigned long)data->MmioAddress; |
| 2722 | #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,63)) | 2722 | #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,63)) |
| 2723 | scsi_set_device(host, &PCIDEV->dev); | ||
| 2724 | #else | ||
| 2725 | scsi_set_pci_device(host, PCIDEV); | 2723 | scsi_set_pci_device(host, PCIDEV); |
| 2726 | #endif | 2724 | #endif |
| 2727 | 2725 | ||