From 044a1343a44e42d3327837fe07f64c7cf1f1e30c Mon Sep 17 00:00:00 2001 From: Myron Stowe Date: Mon, 8 Apr 2013 11:37:55 -0600 Subject: [PATCH] --- yaml --- r: 362865 b: refs/heads/master c: c85bcadc78a99763961b621a5ce097d3134f1aca h: refs/heads/master i: 362863: e612bbc599b737f3021e642e72eaad0c23bbe7c0 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/mvumi.c | 4 ++-- trunk/drivers/scsi/mvumi.h | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b38944e770bf..08a82043fb62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 412e704fbca3b259cafb3e98f6798efde968eb29 +refs/heads/master: c85bcadc78a99763961b621a5ce097d3134f1aca diff --git a/trunk/drivers/scsi/mvumi.c b/trunk/drivers/scsi/mvumi.c index 4594ccaaf49b..c3601b57a80c 100644 --- a/trunk/drivers/scsi/mvumi.c +++ b/trunk/drivers/scsi/mvumi.c @@ -49,8 +49,8 @@ MODULE_AUTHOR("jyli@marvell.com"); MODULE_DESCRIPTION("Marvell UMI Driver"); static DEFINE_PCI_DEVICE_TABLE(mvumi_pci_table) = { - { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_2, PCI_DEVICE_ID_MARVELL_MV9143) }, - { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_2, PCI_DEVICE_ID_MARVELL_MV9580) }, + { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, PCI_DEVICE_ID_MARVELL_MV9143) }, + { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, PCI_DEVICE_ID_MARVELL_MV9580) }, { 0 } }; diff --git a/trunk/drivers/scsi/mvumi.h b/trunk/drivers/scsi/mvumi.h index e360135fd1bd..41f168702ac7 100644 --- a/trunk/drivers/scsi/mvumi.h +++ b/trunk/drivers/scsi/mvumi.h @@ -32,7 +32,6 @@ #define VER_BUILD 1500 #define MV_DRIVER_NAME "mvumi" -#define PCI_VENDOR_ID_MARVELL_2 0x1b4b #define PCI_DEVICE_ID_MARVELL_MV9143 0x9143 #define PCI_DEVICE_ID_MARVELL_MV9580 0x9580