diff options
| author | Natalie.Protasevich@unisys.com <Natalie.Protasevich@unisys.com> | 2006-03-23 02:59:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 07:38:04 -0800 |
| commit | e5428ede94179ddccaa56308e0f194fa299edbb4 (patch) | |
| tree | baba6926b3176442d9bf8cdcc86a5ed30bac22ba /include | |
| parent | 54a20f8c5d778ed3603130de4b92f64405228611 (diff) | |
| download | linux-3.10-e5428ede94179ddccaa56308e0f194fa299edbb4.tar.gz linux-3.10-e5428ede94179ddccaa56308e0f194fa299edbb4.tar.bz2 linux-3.10-e5428ede94179ddccaa56308e0f194fa299edbb4.zip | |
[PATCH] Compilation fix for ES7000 when no ACPI is specified in config (i386)
ES7000 platform code clean up for compilation errors and a warning.
Ifdef'd the ACPI related parts in the ES7000 platform code. They were
causing compile errors in certain configuration (without ACPI defined). I
think this approach would be best (as opposed to Kconfig changes) since it
only touches the subarch...
Signed-off-by: <Natalie.Protasevich@unisys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/mach-es7000/mach_mpparse.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/asm-i386/mach-es7000/mach_mpparse.h b/include/asm-i386/mach-es7000/mach_mpparse.h index 4a0637a3e20..99f66be240b 100644 --- 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; } -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)) @@ -54,6 +55,11 @@ static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) } 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 */ |