summaryrefslogtreecommitdiff
path: root/include/asm-x86/mach-generic
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-09 13:39:02 +0400
committerIngo Molnar <mingo@elte.hu>2008-07-09 13:39:02 +0400
commitd028203c0446c7f65ed2b22342a56f03c6c4a6c1 (patch)
tree6bd73a5c70b407491dc9d40ecb9e95b48233d004 /include/asm-x86/mach-generic
parentf57e91682d141ea50d8c6d42cdc251b6256a3755 (diff)
parent183fe065652dbd64953afa9f389327e23e97967f (diff)
downloadlinux-d028203c0446c7f65ed2b22342a56f03c6c4a6c1.tar.xz
Merge branch 'x86/core' into x86/unify-pci
Diffstat (limited to 'include/asm-x86/mach-generic')
-rw-r--r--include/asm-x86/mach-generic/mach_mpparse.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/asm-x86/mach-generic/mach_mpparse.h b/include/asm-x86/mach-generic/mach_mpparse.h
index 0d0b5ba2e9d1..586cadbf3787 100644
--- a/include/asm-x86/mach-generic/mach_mpparse.h
+++ b/include/asm-x86/mach-generic/mach_mpparse.h
@@ -1,7 +1,10 @@
#ifndef _MACH_MPPARSE_H
#define _MACH_MPPARSE_H 1
-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 mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid);
+
+extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
#endif