git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-i386
/
mach-es7000
/
mach_mpparse.h
diff --git
a/include/asm-i386/mach-es7000/mach_mpparse.h
b/include/asm-i386/mach-es7000/mach_mpparse.h
index
4a0637a
..
99f66be
100644
(file)
--- a/
include/asm-i386/mach-es7000/mach_mpparse.h
+++ b/
include/asm-i386/mach-es7000/mach_mpparse.h
@@
-30,7
+30,8
@@
static inline int mps_oem_check(struct mp_config_table *mpc, char *oem,
return 0;
}
return 0;
}
-static inline int es7000_check_dsdt()
+#ifdef CONFIG_ACPI
+static inline int es7000_check_dsdt(void)
{
struct acpi_table_header *header = NULL;
if(!acpi_get_table_header_early(ACPI_DSDT, &header))
{
struct acpi_table_header *header = NULL;
if(!acpi_get_table_header_early(ACPI_DSDT, &header))
@@
-54,6
+55,11
@@
static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
}
return 0;
}
}
return 0;
}
-
+#else
+static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+{
+ return 0;
+}
+#endif
#endif /* __ASM_MACH_MPPARSE_H */
#endif /* __ASM_MACH_MPPARSE_H */