diff --git a/[refs] b/[refs] index 5cdce9c65065..77d547300d6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 705888184276552a12475f9d9f9ee78136cd523a +refs/heads/master: 8e7ee6f5dfb56a32da760d990be908ed35b1c5bf diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index f11c1c2609d5..a80f9e6ce9e5 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -1604,6 +1604,7 @@ #define PCI_SUBDEVICE_ID_KEYSPAN_SX2 0x5334 #define PCI_VENDOR_ID_MARVELL 0x11ab +#define PCI_VENDOR_ID_MARVELL_EXT 0x1b4b #define PCI_DEVICE_ID_MARVELL_GT64111 0x4146 #define PCI_DEVICE_ID_MARVELL_GT64260 0x6430 #define PCI_DEVICE_ID_MARVELL_MV64360 0x6460