aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Vasquez <andrew.vasquez@qlogic.com>2005-07-06 13:30:16 -0400
committerJames Bottomley <jejb@mulgrave.(none)>2005-07-14 10:54:20 -0400
commitac96202ba096f8fc1ccaf45a2f159a52639ece29 (patch)
treea2a239c061a65c798cb74a47164e5e51f3abf5a8
parentabbd8870b9cb7754a4935826bc9f3c7b029f8b7c (diff)
[SCSI] qla2xxx: Add pci ids for new ISP types.
Add pci ids for new ISP types. Move old definitions in local qla_def.h file to pci_ids.h as well. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/qla2xxx/qla_def.h21
-rw-r--r--include/linux/pci_ids.h9
2 files changed, 9 insertions, 21 deletions
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 24e22dc2fe57..13901c24b9a0 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -41,27 +41,6 @@
41#include <scsi/scsi_device.h> 41#include <scsi/scsi_device.h>
42#include <scsi/scsi_cmnd.h> 42#include <scsi/scsi_cmnd.h>
43 43
44/* XXX(hch): move to pci_ids.h */
45#ifndef PCI_DEVICE_ID_QLOGIC_ISP2300
46#define PCI_DEVICE_ID_QLOGIC_ISP2300 0x2300
47#endif
48
49#ifndef PCI_DEVICE_ID_QLOGIC_ISP2312
50#define PCI_DEVICE_ID_QLOGIC_ISP2312 0x2312
51#endif
52
53#ifndef PCI_DEVICE_ID_QLOGIC_ISP2322
54#define PCI_DEVICE_ID_QLOGIC_ISP2322 0x2322
55#endif
56
57#ifndef PCI_DEVICE_ID_QLOGIC_ISP6312
58#define PCI_DEVICE_ID_QLOGIC_ISP6312 0x6312
59#endif
60
61#ifndef PCI_DEVICE_ID_QLOGIC_ISP6322
62#define PCI_DEVICE_ID_QLOGIC_ISP6322 0x6322
63#endif
64
65#if defined(CONFIG_SCSI_QLA21XX) || defined(CONFIG_SCSI_QLA21XX_MODULE) 44#if defined(CONFIG_SCSI_QLA21XX) || defined(CONFIG_SCSI_QLA21XX_MODULE)
66#define IS_QLA2100(ha) ((ha)->pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2100) 45#define IS_QLA2100(ha) ((ha)->pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2100)
67#else 46#else
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index bf608808a60c..f4c2c393797d 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -908,6 +908,15 @@
908#define PCI_DEVICE_ID_QLOGIC_ISP1022 0x1022 908#define PCI_DEVICE_ID_QLOGIC_ISP1022 0x1022
909#define PCI_DEVICE_ID_QLOGIC_ISP2100 0x2100 909#define PCI_DEVICE_ID_QLOGIC_ISP2100 0x2100
910#define PCI_DEVICE_ID_QLOGIC_ISP2200 0x2200 910#define PCI_DEVICE_ID_QLOGIC_ISP2200 0x2200
911#define PCI_DEVICE_ID_QLOGIC_ISP2300 0x2300
912#define PCI_DEVICE_ID_QLOGIC_ISP2312 0x2312
913#define PCI_DEVICE_ID_QLOGIC_ISP2322 0x2322
914#define PCI_DEVICE_ID_QLOGIC_ISP6312 0x6312
915#define PCI_DEVICE_ID_QLOGIC_ISP6322 0x6322
916#define PCI_DEVICE_ID_QLOGIC_ISP2422 0x2422
917#define PCI_DEVICE_ID_QLOGIC_ISP2432 0x2432
918#define PCI_DEVICE_ID_QLOGIC_ISP2512 0x2512
919#define PCI_DEVICE_ID_QLOGIC_ISP2522 0x2522
911 920
912#define PCI_VENDOR_ID_CYRIX 0x1078 921#define PCI_VENDOR_ID_CYRIX 0x1078
913#define PCI_DEVICE_ID_CYRIX_5510 0x0000 922#define PCI_DEVICE_ID_CYRIX_5510 0x0000