summaryrefslogtreecommitdiffstats
path: root/include/linux/pci_ids.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-08-14 12:14:12 +0200
committerIngo Molnar <mingo@kernel.org>2013-08-14 12:14:12 +0200
commit397f09977ea350a20f20b415a9313cc790137742 (patch)
tree0e44f2f3e5804bd5c0c6f644785006b7225e3c94 /include/linux/pci_ids.h
parent6356bb0ad6525dae93c06478a098ed3848e9ab01 (diff)
parenta4b4bedce880046feeb5b206392960f395ed02ad (diff)
downloadop-kernel-dev-397f09977ea350a20f20b415a9313cc790137742.zip
op-kernel-dev-397f09977ea350a20f20b415a9313cc790137742.tar.gz
Merge tag 'amd_f15_m30' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/ras
Pull AMD F15h, model 0x30 and later enablement stuff, more specifically EDAC support, from Borislav Petkov. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/pci_ids.h')
-rw-r--r--include/linux/pci_ids.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3bed2e8..d1fe5d0 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -518,6 +518,8 @@
#define PCI_DEVICE_ID_AMD_11H_NB_MISC 0x1303
#define PCI_DEVICE_ID_AMD_11H_NB_LINK 0x1304
#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_NB_F0 0x1600
#define PCI_DEVICE_ID_AMD_15H_NB_F1 0x1601
#define PCI_DEVICE_ID_AMD_15H_NB_F2 0x1602
OpenPOWER on IntegriCloud