diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-11 17:42:49 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-11 17:42:49 +0300 |
| commit | d4f7743542f20c2b20b68bba856c281ba9c84e42 (patch) | |
| tree | e01fe3f9736d2851b67fe92e113942cb290194d5 /include | |
| parent | 6b33033c2482b439674807fe546bf2d4ed94a43e (diff) | |
| parent | 3846c15820a1841225d0245afda4875af23dfbbe (diff) | |
| download | linux-d4f7743542f20c2b20b68bba856c281ba9c84e42.tar.xz | |
Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/efi
Pull EFI build fix from Matt Fleming:
- Fix ESRT build breakage on ia64 reported by Guenter Roeck. (Peter Jones)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/efi.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index 024c27e7c0fa..2092965afca3 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -879,7 +879,11 @@ static inline efi_status_t efi_query_variable_store(u32 attributes, unsigned lon #endif extern void __iomem *efi_lookup_mapped_addr(u64 phys_addr); extern int efi_config_init(efi_config_table_type_t *arch_tables); +#ifdef CONFIG_EFI_ESRT extern void __init efi_esrt_init(void); +#else +static inline void efi_esrt_init(void) { } +#endif extern int efi_config_parse_tables(void *config_tables, int count, int sz, efi_config_table_type_t *arch_tables); extern u64 efi_get_iobase (void); |