Merge branch 'linus' into timers/nohz

[linux-2.6] / include / asm-x86 / mach-generic / mach_mpparse.h

diff --git a/include/asm-x86/mach-generic/mach_mpparse.h b/include/asm-x86/mach-generic/mach_mpparse.h
index dbd9fce54f4d52be2ddf59fa667d5330fad50f05..586cadbf3787ce9c98449921db1c14c942d418bc 100644 (file)
--- a/include/asm-x86/mach-generic/mach_mpparse.h
+++ b/include/asm-x86/mach-generic/mach_mpparse.h
@@ -1,12 +1,10 @@
 #ifndef _MACH_MPPARSE_H
 #define _MACH_MPPARSE_H 1
 
-#include <asm/genapic.h>
 
-#define mpc_oem_bus_info (genapic->mpc_oem_bus_info)
-#define mpc_oem_pci_bus (genapic->mpc_oem_pci_bus)
+extern int mps_oem_check(struct mp_config_table *mpc, char *oem,
+                        char *productid);
 
-int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid); 
-int acpi_madt_oem_check(char *oem_id, char *oem_table_id); 
+extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
 
 #endif