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/nsp32.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/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 | ||