diff options
| author | 2022-08-05 18:37:03 +0200 | |
|---|---|---|
| committer | 2022-08-05 18:37:03 +0200 | |
| commit | 446279168e030fd0ed68e2bba336bef8bb3da352 (patch) | |
| tree | 0944d4dc64b07f74a6cf73d2ce803a789f8d786d /include/linux/efi.h | |
| parent | gfs2: Minor gfs2_glock_nq_m cleanup (diff) | |
| parent | gfs2: List traversal in do_promote is safe (diff) | |
Merge part of branch 'for-next.instantiate' into for-next
Diffstat (limited to 'include/linux/efi.h')
| -rw-r--r-- | include/linux/efi.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index db424f3dc3f2..7d9b0bb47eb3 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1349,11 +1349,7 @@ 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 struct linux_efi_coco_secret_area { u64 base_pa; |
