commit 05183aa996b2971884a60041e995b470b8224574 Author: Stijn Tintel Date: Sun Feb 10 01:01:16 2013 +0100 Move PCI_VENDOR_ID_MARVELL_2 to pci_ids.h Signed-off-by: Stijn Tintel diff --git a/drivers/scsi/mvumi.h b/drivers/scsi/mvumi.h index e360135..41f1687 100644 --- a/drivers/scsi/mvumi.h +++ b/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 diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 0eb6579..60c4ff4 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1608,6 +1608,7 @@ #define PCI_DEVICE_ID_MARVELL_GT64260 0x6430 #define PCI_DEVICE_ID_MARVELL_MV64360 0x6460 #define PCI_DEVICE_ID_MARVELL_MV64460 0x6480 +#define PCI_VENDOR_ID_MARVELL_2 0x1b4b #define PCI_DEVICE_ID_MARVELL_88ALP01_NAND 0x4100 #define PCI_DEVICE_ID_MARVELL_88ALP01_SD 0x4101 #define PCI_DEVICE_ID_MARVELL_88ALP01_CCIC 0x4102