diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 16:27:05 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 16:27:05 +1100 |
| commit | 03af16e069bc949aaab3afe0c8d80cf0af58826a (patch) | |
| tree | 0f95422bd10afb33604f9ebd10f2ca84ac65c759 /arch | |
| parent | 544ca014aa78b3ed72482c017d070aaa6db709b4 (diff) | |
| parent | 496474771a852d2b0ac2bcb47740e1ed11804cda (diff) | |
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
include/linux/pci_ids.h
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/amd_nb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index ed3c2e5b714a..5e4c75b3d18b 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -15,7 +15,7 @@ static u32 *flush_words; const struct pci_device_id amd_nb_misc_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) }, { 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_MISC) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) }, {} }; EXPORT_SYMBOL(amd_nb_misc_ids); |