diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
| commit | 30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch) | |
| tree | eb6a47cae63d3587fa773cc5a16781eaa2c7810b /drivers/scsi/advansys.c | |
| parent | 03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c (diff) | |
| parent | f56df2f4db6e4af87fb8e941cff69f4501a111df (diff) | |
Merge branch 'linus'
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( | |||
| 18215 | } | 18215 | } |
| 18216 | MODULE_LICENSE("Dual BSD/GPL"); | 18216 | MODULE_LICENSE("Dual BSD/GPL"); |
| 18217 | 18217 | ||
| 18218 | #ifdef CONFIG_PCI | ||
| 18218 | /* PCI Devices supported by this driver */ | 18219 | /* PCI Devices supported by this driver */ |
| 18219 | static struct pci_device_id advansys_pci_tbl[] __devinitdata = { | 18220 | static struct pci_device_id advansys_pci_tbl[] __devinitdata = { |
| 18220 | { PCI_VENDOR_ID_ASP, PCI_DEVICE_ID_ASP_1200A, | 18221 | { PCI_VENDOR_ID_ASP, PCI_DEVICE_ID_ASP_1200A, |
| @@ -18232,4 +18233,4 @@ static struct pci_device_id advansys_pci_tbl[] __devinitdata = { | |||
| 18232 | { } | 18233 | { } |
| 18233 | }; | 18234 | }; |
| 18234 | MODULE_DEVICE_TABLE(pci, advansys_pci_tbl); | 18235 | MODULE_DEVICE_TABLE(pci, advansys_pci_tbl); |
| 18235 | 18236 | #endif /* CONFIG_PCI */ | |