From: Herton R. Krzesinski herton@redhat.com
Revert "scsi: smartpqi: add inspur advantech ids"
This reverts commit 5330336348c05ca65b2d3c485ffff4ef0f5ddf3a.
This was already applied upstream in commit 9f8d05fa98442. With this commit we had duplicated pci ids in the table.
Signed-off-by: Herton R. Krzesinski herton@redhat.com
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index blahblah..blahblah 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -8807,18 +8807,6 @@ static const struct pci_device_id pqi_pci_id_table[] = { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, 0x19e5, 0xd22c) }, - { - PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, - 0x1bd4, 0x004a) - }, - { - PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, - 0x1bd4, 0x004b) - }, - { - PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, - 0x1bd4, 0x004c) - }, { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, PCI_VENDOR_ID_ADAPTEC2, 0x0110) @@ -9075,10 +9063,6 @@ static const struct pci_device_id pqi_pci_id_table[] = { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, PCI_VENDOR_ID_ADVANTECH, 0x8312) }, - { - PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, - PCI_VENDOR_ID_ADVANTECH, 0x8312) - }, { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, PCI_VENDOR_ID_DELL, 0x1fe0)
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1246
From: Justin M. Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1246#note_6226132...
Acked-by: Justin M. Forbes jforbes@fedoraproject.org (via approve button)
From: Patrick Talbert on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1246#note_6240197...
Acked-by: Patrick Talbert ptalbert@redhat.com (via approve button)
kernel@lists.fedoraproject.org