diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /drivers/scsi/BusLogic.c | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'drivers/scsi/BusLogic.c')
| -rw-r--r-- | drivers/scsi/BusLogic.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c index 689dc4cc789c..3075204915c8 100644 --- a/drivers/scsi/BusLogic.c +++ b/drivers/scsi/BusLogic.c | |||
| @@ -3600,5 +3600,16 @@ static void __exit BusLogic_exit(void) | |||
| 3600 | 3600 | ||
| 3601 | __setup("BusLogic=", BusLogic_Setup); | 3601 | __setup("BusLogic=", BusLogic_Setup); |
| 3602 | 3602 | ||
| 3603 | static struct pci_device_id BusLogic_pci_tbl[] __devinitdata = { | ||
| 3604 | { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER, | ||
| 3605 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | ||
| 3606 | { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC, | ||
| 3607 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | ||
| 3608 | { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT, | ||
| 3609 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | ||
| 3610 | { } | ||
| 3611 | }; | ||
| 3612 | MODULE_DEVICE_TABLE(pci, BusLogic_pci_tbl); | ||
| 3613 | |||
| 3603 | module_init(BusLogic_init); | 3614 | module_init(BusLogic_init); |
| 3604 | module_exit(BusLogic_exit); | 3615 | module_exit(BusLogic_exit); |