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 /include | |
| parent | 544ca014aa78b3ed72482c017d070aaa6db709b4 (diff) | |
| parent | 496474771a852d2b0ac2bcb47740e1ed11804cda (diff) | |
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
include/linux/pci_ids.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index ffbe9238044b..bda221dfaf0a 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -517,7 +517,7 @@ #define PCI_DEVICE_ID_AMD_11H_NB_DRAM 0x1302 #define PCI_DEVICE_ID_AMD_11H_NB_MISC 0x1303 #define PCI_DEVICE_ID_AMD_11H_NB_LINK 0x1304 -#define PCI_DEVICE_ID_AMD_15H_NB_MISC 0x1603 +#define PCI_DEVICE_ID_AMD_15H_NB_F3 0x1603 #define PCI_DEVICE_ID_AMD_15H_NB_LINK 0x1604 #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703 #define PCI_DEVICE_ID_AMD_LANCE 0x2000 |