diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 10:35:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 10:35:34 -0800 |
| commit | 365bbe0d0caaf2ba74d56556827babf0bc66965d (patch) | |
| tree | 1b5bce452bc768398b19967a3123bd8c4adcb9f1 /drivers/scsi/advansys.c | |
| parent | 0bf98542a07ee1341830dcc4be63df85645f76b9 (diff) | |
| parent | 3ef49a3b45c33b055002402f01e5da98cb773086 (diff) | |
| download | talos-op-linux-365bbe0d0caaf2ba74d56556827babf0bc66965d.tar.gz talos-op-linux-365bbe0d0caaf2ba74d56556827babf0bc66965d.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (30 commits)
[SCSI] qla1280: set residual correctly
[SCSI] fusion: bump version
[SCSI] fusion: MODULE_VERSION support
[SCSI] fusion: power pc and miscellaneous bug fixs
[SCSI] fusion: fibre channel: return DID_ERROR for MPI_IOCSTATUS_SCSI_IOC_TERMINATED
[SCSI] megaraid_sas: Update module author
[SCSI] 3ware 8000 serialize reset code
[SCSI] sr: fix error code check in sr_block_ioctl()
[SCSI] scsi: lpfc error path fix
[SCSI] aacraid: Product List Update
[SCSI] libiscsi: fix senselen calculation
[SCSI] iscsi: simplify IPv6 and IPv4 address printing
[SCSI] iscsi: newline in printk
[SCSI] iscsi: fix crypto_alloc_hash() error check
[SCSI] iscsi: fix 2.6.19 data digest calculation bug
[SCSI] scsi_scan: fix report lun problems with CDROM or RBC devices
[SCSI] qla2xxx: Update version number to 8.01.07-k4.
[SCSI] qla2xxx: Use generic isp_ops.fw_dump() function.
[SCSI] qla2xxx: Perform a fw-dump when an ISP23xx RISC-paused state is detected.
[SCSI] qla2xxx: Correct reset handling logic.
...
Diffstat (limited to 'drivers/scsi/advansys.c')
| -rw-r--r-- | drivers/scsi/advansys.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 2b344356a29e..306bec355e45 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c @@ -18215,6 +18215,7 @@ AdvInquiryHandling( } MODULE_LICENSE("Dual BSD/GPL"); +#ifdef CONFIG_PCI /* PCI Devices supported by this driver */ static struct pci_device_id advansys_pci_tbl[] __devinitdata = { { PCI_VENDOR_ID_ASP, PCI_DEVICE_ID_ASP_1200A, @@ -18232,4 +18233,4 @@ static struct pci_device_id advansys_pci_tbl[] __devinitdata = { { } }; MODULE_DEVICE_TABLE(pci, advansys_pci_tbl); - +#endif /* CONFIG_PCI */ |
