Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6

Authored by Borislav Petkov
Committed by Ingo Molnar
1 parent 438008af63
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

arch/x86/kernel/amd_nb.c
Diff comments   View file @ cb6c852
... ... @@ -21,7 +21,7 @@
21 21 EXPORT_SYMBOL(amd_nb_misc_ids);
22 22  
23 23 static struct pci_device_id amd_nb_link_ids[] = {
24   - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_LINK) },
  24 + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
25 25 {}
26 26 };
27 27  
include/linux/pci_ids.h
Diff comments   View file @ cb6c852
... ... @@ -518,7 +518,7 @@
518 518 #define PCI_DEVICE_ID_AMD_11H_NB_MISC 0x1303
519 519 #define PCI_DEVICE_ID_AMD_11H_NB_LINK 0x1304
520 520 #define PCI_DEVICE_ID_AMD_15H_NB_F3 0x1603
521   -#define PCI_DEVICE_ID_AMD_15H_NB_LINK 0x1604
  521 +#define PCI_DEVICE_ID_AMD_15H_NB_F4 0x1604
522 522 #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
523 523 #define PCI_DEVICE_ID_AMD_LANCE 0x2000
524 524 #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001