diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-04-19 13:03:08 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-04-19 13:03:08 +0200 |
commit | 5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e (patch) | |
tree | 524d8ac34cc8c7ef68b43e3ee6e08e27db86299c /arch/x86/kernel/amd_nb.c | |
parent | b6d5278dc8385eaf2e3904a4af444a04f6ae4e71 (diff) | |
parent | 94c1acf2c85b03a59a42d931a94a13a76c123a62 (diff) | |
download | linux-stable-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.tar.gz linux-stable-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.tar.bz2 linux-stable-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.zip |
Merge tag 'edac_amd_f16h' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull AMD F16h support for amd64_edac from Borislav Petkov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/amd_nb.c')
-rw-r--r-- | arch/x86/kernel/amd_nb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index aadf3359e2a7..f1d0a1446d3a 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -20,12 +20,14 @@ const struct pci_device_id amd_nb_misc_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) }, {} }; EXPORT_SYMBOL(amd_nb_misc_ids); static struct pci_device_id amd_nb_link_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) }, {} }; @@ -81,7 +83,6 @@ int amd_cache_northbridges(void) next_northbridge(link, amd_nb_link_ids); } - /* some CPU families (e.g. family 0x11) do not support GART */ if (boot_cpu_data.x86 == 0xf || boot_cpu_data.x86 == 0x10 || boot_cpu_data.x86 == 0x15) amd_northbridges.flags |= AMD_NB_GART; |