diff options
| author | Linus Torvalds | 2021-12-27 08:58:35 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2021-12-27 08:58:35 -0800 |
| commit | a8ad9a2434dc7967ab285437f443cae633b6fc1c (patch) | |
| tree | 366e95790e66fcc2d916052b1b5150e70239c3c5 /include | |
| parent | fc74e0a40e4f9fd0468e34045b0c45bba11dcbb2 (diff) | |
| parent | 4bc5e64e6cf37007e436970024e5998ee0935651 (diff) | |
Merge tag 'efi-urgent-for-v5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
Pull EFI fix from Ard Biesheuvel:
"Another EFI fix for v5.16:
- Prevent missing prototype warning from breaking the build under
CONFIG_WERROR=y"
* tag 'efi-urgent-for-v5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
efi: Move efifb_setup_from_dmi() prototype from arch headers
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/efi.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index dbd39b20e034..ef8dbc0a1522 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1283,4 +1283,10 @@ static inline struct efi_mokvar_table_entry *efi_mokvar_entry_find( } #endif +#ifdef CONFIG_SYSFB +extern void efifb_setup_from_dmi(struct screen_info *si, const char *opt); +#else +static inline void efifb_setup_from_dmi(struct screen_info *si, const char *opt) { } +#endif + #endif /* _LINUX_EFI_H */ |