Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[karo-tx-linux.git] / drivers / scsi / mvsas / mv_init.c

diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index c7c250519c4b05102001024871f8eca9500914a0..8280046fd1f0d7d9b2882d5aa6c689a11eab53c7 100644 (file)
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -704,24 +704,7 @@ static struct pci_device_id mvs_pci_table[] = {
                .class_mask     = 0,
                .driver_data    = chip_9445,
        },
-       {
-               .vendor         = PCI_VENDOR_ID_MARVELL_EXT,
-               .device         = 0x9485,
-               .subvendor      = PCI_ANY_ID,
-               .subdevice      = 0x9480,
-               .class          = 0,
-               .class_mask     = 0,
-               .driver_data    = chip_9485,
-       },
-       {
-               .vendor         = PCI_VENDOR_ID_MARVELL_EXT,
-               .device         = 0x9485,
-               .subvendor      = PCI_ANY_ID,
-               .subdevice      = 0x9485,
-               .class          = 0,
-               .class_mask     = 0,
-               .driver_data    = chip_9485,
-       },
+       { PCI_VDEVICE(MARVELL_EXT, 0x9485), chip_9485 }, /* Marvell 9480/9485 (any vendor/model) */
        { PCI_VDEVICE(OCZ, 0x1021), chip_9485}, /* OCZ RevoDrive3 */
        { PCI_VDEVICE(OCZ, 0x1022), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */
        { PCI_VDEVICE(OCZ, 0x1040), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */