diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 08:45:33 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 08:45:47 (GMT) |
| commit | 275a88d3cf0e2f08a98dc5ce9494af0cb6ed2092 (patch) | |
| tree | 785ce29ec09904fbde73c63e3aeadaf6537752a5 /include | |
| parent | 52b8b8d7251f8f7b8ed4a6c623618106d83e18b5 (diff) | |
| parent | 9e81509efc4fefcdd75cc6a4121672fa71ae8745 (diff) | |
| download | linux-275a88d3cf0e2f08a98dc5ce9494af0cb6ed2092.tar.xz | |
Merge branch 'x86/amd-nb' into x86/mm
Merge reason: consolidate it into the more generic x86/mm tree to prevent conflicts
with ongoing NUMA work.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 3adb06e..580de67 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -518,6 +518,7 @@ #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_LINK 0x1604 #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703 #define PCI_DEVICE_ID_AMD_LANCE 0x2000 #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001 |