diff options
-rw-r--r-- | arch/x86/kernel/amd_nb.c | 1 | ||||
-rw-r--r-- | drivers/hwmon/k10temp.c | 5 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index be16854591cc..153a0ee88fb1 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c | |||
@@ -16,6 +16,7 @@ const struct pci_device_id amd_nb_misc_ids[] = { | |||
16 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) }, | 16 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) }, |
17 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) }, | 17 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) }, |
18 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) }, | 18 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) }, |
19 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) }, | ||
19 | {} | 20 | {} |
20 | }; | 21 | }; |
21 | EXPORT_SYMBOL(amd_nb_misc_ids); | 22 | EXPORT_SYMBOL(amd_nb_misc_ids); |
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 7356b5ec8f67..f2fe8078633b 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c | |||
@@ -33,9 +33,6 @@ static bool force; | |||
33 | module_param(force, bool, 0444); | 33 | module_param(force, bool, 0444); |
34 | MODULE_PARM_DESC(force, "force loading on processors with erratum 319"); | 34 | MODULE_PARM_DESC(force, "force loading on processors with erratum 319"); |
35 | 35 | ||
36 | /* PCI-IDs for Northbridge devices not used anywhere else */ | ||
37 | #define PCI_DEVICE_ID_AMD_15H_M10H_NB_F3 0x1403 | ||
38 | |||
39 | /* CPUID function 0x80000001, ebx */ | 36 | /* CPUID function 0x80000001, ebx */ |
40 | #define CPUID_PKGTYPE_MASK 0xf0000000 | 37 | #define CPUID_PKGTYPE_MASK 0xf0000000 |
41 | #define CPUID_PKGTYPE_F 0x00000000 | 38 | #define CPUID_PKGTYPE_F 0x00000000 |
@@ -213,7 +210,7 @@ static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = { | |||
213 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) }, | 210 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) }, |
214 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) }, | 211 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) }, |
215 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) }, | 212 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) }, |
216 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_NB_F3) }, | 213 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) }, |
217 | {} | 214 | {} |
218 | }; | 215 | }; |
219 | MODULE_DEVICE_TABLE(pci, k10temp_id_table); | 216 | MODULE_DEVICE_TABLE(pci, k10temp_id_table); |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index ab741b0d0074..05fd02e44993 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -517,6 +517,7 @@ | |||
517 | #define PCI_DEVICE_ID_AMD_11H_NB_DRAM 0x1302 | 517 | #define PCI_DEVICE_ID_AMD_11H_NB_DRAM 0x1302 |
518 | #define PCI_DEVICE_ID_AMD_11H_NB_MISC 0x1303 | 518 | #define PCI_DEVICE_ID_AMD_11H_NB_MISC 0x1303 |
519 | #define PCI_DEVICE_ID_AMD_11H_NB_LINK 0x1304 | 519 | #define PCI_DEVICE_ID_AMD_11H_NB_LINK 0x1304 |
520 | #define PCI_DEVICE_ID_AMD_15H_M10H_F3 0x1403 | ||
520 | #define PCI_DEVICE_ID_AMD_15H_NB_F0 0x1600 | 521 | #define PCI_DEVICE_ID_AMD_15H_NB_F0 0x1600 |
521 | #define PCI_DEVICE_ID_AMD_15H_NB_F1 0x1601 | 522 | #define PCI_DEVICE_ID_AMD_15H_NB_F1 0x1601 |
522 | #define PCI_DEVICE_ID_AMD_15H_NB_F2 0x1602 | 523 | #define PCI_DEVICE_ID_AMD_15H_NB_F2 0x1602 |