Commit ac96202b authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[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: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent abbd8870

drivers/scsi/qla2xxx/qla_def.h

+0 −21
Original line number Diff line number Diff line
@@ -41,27 +41,6 @@ 
#include <scsi/scsi_device.h>

#include <scsi/scsi_cmnd.h>



/* XXX(hch): move to pci_ids.h */

#ifndef PCI_DEVICE_ID_QLOGIC_ISP2300

#define PCI_DEVICE_ID_QLOGIC_ISP2300	0x2300

#endif



#ifndef PCI_DEVICE_ID_QLOGIC_ISP2312

#define PCI_DEVICE_ID_QLOGIC_ISP2312	0x2312

#endif



#ifndef PCI_DEVICE_ID_QLOGIC_ISP2322

#define PCI_DEVICE_ID_QLOGIC_ISP2322	0x2322

#endif



#ifndef PCI_DEVICE_ID_QLOGIC_ISP6312

#define PCI_DEVICE_ID_QLOGIC_ISP6312	0x6312

#endif



#ifndef PCI_DEVICE_ID_QLOGIC_ISP6322

#define PCI_DEVICE_ID_QLOGIC_ISP6322	0x6322

#endif



#if defined(CONFIG_SCSI_QLA21XX) || defined(CONFIG_SCSI_QLA21XX_MODULE)

#define IS_QLA2100(ha)	((ha)->pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2100)

#else

include/linux/pci_ids.h

+9 −0
Original line number Diff line number Diff line
@@ -908,6 +908,15 @@ 
#define PCI_DEVICE_ID_QLOGIC_ISP1022	0x1022

#define PCI_DEVICE_ID_QLOGIC_ISP2100	0x2100

#define PCI_DEVICE_ID_QLOGIC_ISP2200	0x2200

#define PCI_DEVICE_ID_QLOGIC_ISP2300	0x2300

#define PCI_DEVICE_ID_QLOGIC_ISP2312	0x2312

#define PCI_DEVICE_ID_QLOGIC_ISP2322	0x2322

#define PCI_DEVICE_ID_QLOGIC_ISP6312	0x6312

#define PCI_DEVICE_ID_QLOGIC_ISP6322	0x6322

#define PCI_DEVICE_ID_QLOGIC_ISP2422	0x2422

#define PCI_DEVICE_ID_QLOGIC_ISP2432	0x2432

#define PCI_DEVICE_ID_QLOGIC_ISP2512	0x2512

#define PCI_DEVICE_ID_QLOGIC_ISP2522	0x2522



#define PCI_VENDOR_ID_CYRIX		0x1078

#define PCI_DEVICE_ID_CYRIX_5510	0x0000