diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_hwi.h | 12 | ||||
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_init.c | 25 |
2 files changed, 9 insertions, 28 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_hwi.h b/drivers/scsi/aic94xx/aic94xx_hwi.h index c6c3d18222fa..491e5d8a98bc 100644 --- a/drivers/scsi/aic94xx/aic94xx_hwi.h +++ b/drivers/scsi/aic94xx/aic94xx_hwi.h | |||
@@ -40,18 +40,6 @@ | |||
40 | #define ASD_MAX_PHYS 8 | 40 | #define ASD_MAX_PHYS 8 |
41 | #define ASD_PCBA_SN_SIZE 12 | 41 | #define ASD_PCBA_SN_SIZE 12 |
42 | 42 | ||
43 | /* Those are to be further named properly, the "RAZORx" part, and | ||
44 | * subsequently included in include/linux/pci_ids.h. | ||
45 | */ | ||
46 | #define PCI_DEVICE_ID_ADAPTEC2_RAZOR10 0x410 | ||
47 | #define PCI_DEVICE_ID_ADAPTEC2_RAZOR12 0x412 | ||
48 | #define PCI_DEVICE_ID_ADAPTEC2_RAZOR1E 0x41E | ||
49 | #define PCI_DEVICE_ID_ADAPTEC2_RAZOR1F 0x41F | ||
50 | #define PCI_DEVICE_ID_ADAPTEC2_RAZOR30 0x430 | ||
51 | #define PCI_DEVICE_ID_ADAPTEC2_RAZOR32 0x432 | ||
52 | #define PCI_DEVICE_ID_ADAPTEC2_RAZOR3E 0x43E | ||
53 | #define PCI_DEVICE_ID_ADAPTEC2_RAZOR3F 0x43F | ||
54 | |||
55 | struct asd_ha_addrspace { | 43 | struct asd_ha_addrspace { |
56 | void __iomem *addr; | 44 | void __iomem *addr; |
57 | unsigned long start; /* pci resource start */ | 45 | unsigned long start; /* pci resource start */ |
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index 63bcde246447..63d104578a77 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c | |||
@@ -829,22 +829,15 @@ static struct sas_domain_function_template aic94xx_transport_functions = { | |||
829 | }; | 829 | }; |
830 | 830 | ||
831 | static const struct pci_device_id aic94xx_pci_table[] __devinitdata = { | 831 | static const struct pci_device_id aic94xx_pci_table[] __devinitdata = { |
832 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_RAZOR10), | 832 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1}, |
833 | 0, 0, 1}, | 833 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1}, |
834 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_RAZOR12), | 834 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1}, |
835 | 0, 0, 1}, | 835 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x41E),0, 0, 1}, |
836 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_RAZOR1E), | 836 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x41F),0, 0, 1}, |
837 | 0, 0, 1}, | 837 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x430),0, 0, 2}, |
838 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_RAZOR1F), | 838 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x432),0, 0, 2}, |
839 | 0, 0, 1}, | 839 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x43E),0, 0, 2}, |
840 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_RAZOR30), | 840 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x43F),0, 0, 2}, |
841 | 0, 0, 2}, | ||
842 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_RAZOR32), | ||
843 | 0, 0, 2}, | ||
844 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_RAZOR3E), | ||
845 | 0, 0, 2}, | ||
846 | {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_RAZOR3F), | ||
847 | 0, 0, 2}, | ||
848 | {} | 841 | {} |
849 | }; | 842 | }; |
850 | 843 | ||