| Message ID | 1411070195-10177-1-git-send-email-Aravind.Gopalakrishnan@amd.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On Thu, Sep 18, 2014 at 02:56:35PM -0500, Aravind Gopalakrishnan wrote: > Add F3, F4 device IDs to be used in amd_nb.c and amd64_edac.c > > Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Please merge this along with the rest of your series. > --- > include/linux/pci_ids.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h > index aa0d390..6a2a72a 100644 > --- a/include/linux/pci_ids.h > +++ b/include/linux/pci_ids.h > @@ -522,6 +522,8 @@ > #define PCI_DEVICE_ID_AMD_15H_M10H_F3 0x1403 > #define PCI_DEVICE_ID_AMD_15H_M30H_NB_F3 0x141d > #define PCI_DEVICE_ID_AMD_15H_M30H_NB_F4 0x141e > +#define PCI_DEVICE_ID_AMD_15H_M60H_NB_F3 0x1573 > +#define PCI_DEVICE_ID_AMD_15H_M60H_NB_F4 0x1574 > #define PCI_DEVICE_ID_AMD_15H_NB_F0 0x1600 > #define PCI_DEVICE_ID_AMD_15H_NB_F1 0x1601 > #define PCI_DEVICE_ID_AMD_15H_NB_F2 0x1602 > -- > 2.0.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Sep 18, 2014 at 11:31:26PM -0600, Bjorn Helgaas wrote: > On Thu, Sep 18, 2014 at 02:56:35PM -0500, Aravind Gopalakrishnan wrote: > > Add F3, F4 device IDs to be used in amd_nb.c and amd64_edac.c > > > > Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com> > > Acked-by: Bjorn Helgaas <bhelgaas@google.com> > > Please merge this along with the rest of your series. Queued for 3.19, thanks.
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index aa0d390..6a2a72a 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -522,6 +522,8 @@ #define PCI_DEVICE_ID_AMD_15H_M10H_F3 0x1403 #define PCI_DEVICE_ID_AMD_15H_M30H_NB_F3 0x141d #define PCI_DEVICE_ID_AMD_15H_M30H_NB_F4 0x141e +#define PCI_DEVICE_ID_AMD_15H_M60H_NB_F3 0x1573 +#define PCI_DEVICE_ID_AMD_15H_M60H_NB_F4 0x1574 #define PCI_DEVICE_ID_AMD_15H_NB_F0 0x1600 #define PCI_DEVICE_ID_AMD_15H_NB_F1 0x1601 #define PCI_DEVICE_ID_AMD_15H_NB_F2 0x1602
Add F3, F4 device IDs to be used in amd_nb.c and amd64_edac.c Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com> --- include/linux/pci_ids.h | 2 ++ 1 file changed, 2 insertions(+)