x86: make struct mpc_config_translation NUMAQ-only

[sfrench/cifs-2.6.git] / include / asm-x86 / genapic_32.h

diff --git a/include/asm-x86/genapic_32.h b/include/asm-x86/genapic_32.h
index 33e3ffe1766ccc4fc493d7c0ee623c7e66dd0ef7..b501ae7809ba2e63087d8a2e43cd0c03b05014ef 100644 (file)
--- a/include/asm-x86/genapic_32.h
+++ b/include/asm-x86/genapic_32.h
@@ -14,7 +14,6 @@
  * Copyright 2003 Andi Kleen, SuSE Labs.
  */
 
-struct mpc_config_translation;
 struct mpc_config_bus;
 struct mp_config_table;
 struct mpc_config_processor;
@@ -42,19 +41,12 @@ struct genapic {
        int (*cpu_to_logical_apicid)(int cpu);
        int (*cpu_present_to_apicid)(int mps_cpu);
        physid_mask_t (*apicid_to_cpu_present)(int phys_apicid);
-       int (*mpc_apic_id)(struct mpc_config_processor *m, 
-                          struct mpc_config_translation *t); 
        void (*setup_portio_remap)(void); 
        int (*check_phys_apicid_present)(int boot_cpu_physical_apicid);
        void (*enable_apic_mode)(void);
        u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb);
 
        /* mpparse */
-       void (*mpc_oem_bus_info)(struct mpc_config_bus *, char *, 
-                                struct mpc_config_translation *);
-       void (*mpc_oem_pci_bus)(struct mpc_config_bus *, 
-                               struct mpc_config_translation *); 
-
        /* When one of the next two hooks returns 1 the genapic
           is switched to this. Essentially they are additional probe 
           functions. */
@@ -105,11 +97,8 @@ struct genapic {
        APICFUNC(cpu_to_logical_apicid) \
        APICFUNC(cpu_present_to_apicid) \
        APICFUNC(apicid_to_cpu_present) \
-       APICFUNC(mpc_apic_id) \
        APICFUNC(setup_portio_remap) \
        APICFUNC(check_phys_apicid_present) \
-       APICFUNC(mpc_oem_bus_info) \
-       APICFUNC(mpc_oem_pci_bus) \
        APICFUNC(mps_oem_check) \
        APICFUNC(get_apic_id) \
        .apic_id_mask = APIC_ID_MASK, \