diff --git a/[refs] b/[refs] index 5507ca9d5ba7..9a064ad4f4bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edb9068d0d7a3ba92f66b8c86cba625f3a439f64 +refs/heads/master: 0c8db6beb81a07147f64cffd33bd43b9e96f4f40 diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 2c7add169539..13d36bb01a42 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -2017,6 +2017,8 @@ #define PCI_VENDOR_ID_ARIMA 0x161f +#define PCI_VENDOR_ID_BROCADE 0x1657 + #define PCI_VENDOR_ID_SIBYTE 0x166d #define PCI_DEVICE_ID_BCM1250_PCI 0x0001 #define PCI_DEVICE_ID_BCM1250_HT 0x0002