]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
x86, amd-nb: Rename CPU PCI id define for F4
authorBorislav Petkov <bp@amd64.org>
Wed, 30 Mar 2011 18:34:47 +0000 (20:34 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 31 Mar 2011 06:51:38 +0000 (08:51 +0200)
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>
arch/x86/kernel/amd_nb.c
include/linux/pci_ids.h

index 6801959a8b2a4976c8e45d55c89df93f1c574d17..4c39baa8facc25529c7018e53b38de43eab823d9 100644 (file)
@@ -21,7 +21,7 @@ const struct pci_device_id amd_nb_misc_ids[] = {
 EXPORT_SYMBOL(amd_nb_misc_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) },
        {}
 };
 
index 11fd38151cc9bda3c96c9709aa5c92249f840fee..4e2c9150a78525859455ffb1e06551d4b3781b33 100644 (file)
 #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_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_LANCE                0x2000
 #define PCI_DEVICE_ID_AMD_LANCE_HOME   0x2001