Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

x86, amd-nb: Rename CPU PCI id define for F4

With increasing number of PCI function ids, add the PCI function
id in the define name instead of its symbolic name in the BKDG
for more clarity. This renames function 4 define.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
LKML-Reference: <20110330183447.GA3668@aftab>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Borislav Petkov 14 years ago
parent
438008af63
commit
cb6c8520f6
2 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      arch/x86/kernel/amd_nb.c
  2. 1 1
      include/linux/pci_ids.h

+ 1 - 1
arch/x86/kernel/amd_nb.c
View File 

@@ -21,7 +21,7 @@ const struct pci_device_id amd_nb_misc_ids[] = {
 
 EXPORT_SYMBOL(amd_nb_misc_ids);
 
 EXPORT_SYMBOL(amd_nb_misc_ids);
 
 
 
 static struct pci_device_id amd_nb_link_ids[] = {
 
 static struct pci_device_id amd_nb_link_ids[] = {
 
-	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_LINK) },
 
+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
 
 	{}
 
 	{}
 
 };
 
 };

+ 1 - 1
include/linux/pci_ids.h
View File 

@@ -518,7 +518,7 @@
 
 #define PCI_DEVICE_ID_AMD_11H_NB_MISC	0x1303
 
 #define PCI_DEVICE_ID_AMD_11H_NB_MISC	0x1303
 
 #define PCI_DEVICE_ID_AMD_11H_NB_LINK	0x1304
 
 #define PCI_DEVICE_ID_AMD_11H_NB_LINK	0x1304
 
 #define PCI_DEVICE_ID_AMD_15H_NB_F3	0x1603
 
 #define PCI_DEVICE_ID_AMD_15H_NB_F3	0x1603
 
-#define PCI_DEVICE_ID_AMD_15H_NB_LINK	0x1604
 
+#define PCI_DEVICE_ID_AMD_15H_NB_F4	0x1604
 
 #define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703
 
 #define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703
 
 #define PCI_DEVICE_ID_AMD_LANCE		0x2000
 
 #define PCI_DEVICE_ID_AMD_LANCE		0x2000
 
 #define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001
 
 #define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001