x86: rename mpc_config_processor to mpc_cpu

[safe/jmp/linux-2.6] / arch / x86 / kernel / mmconf-fam10h_64.c

diff --git a/arch/x86/kernel/mmconf-fam10h_64.c b/arch/x86/kernel/mmconf-fam10h_64.c
index edc5fbf..666e43d 100644 (file)
--- a/arch/x86/kernel/mmconf-fam10h_64.c
+++ b/arch/x86/kernel/mmconf-fam10h_64.c
@@ -12,8 +12,8 @@
 #include <asm/io.h>
 #include <asm/msr.h>
 #include <asm/acpi.h>
-
-#include "../pci/pci.h"
+#include <asm/mmconfig.h>
+#include <asm/pci_x86.h>
 
 struct pci_hostbridge_probe {
        u32 bus;
@@ -237,7 +237,7 @@ static struct dmi_system_id __devinitdata mmconf_dmi_table[] = {
        {}
 };
 
-void __init check_enable_amd_mmconf_dmi(void)
+void __cpuinit check_enable_amd_mmconf_dmi(void)
 {
        dmi_check_system(mmconf_dmi_table);
 }