aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-12-27 08:58:35 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-12-27 08:58:35 -0800
commita8ad9a2434dc7967ab285437f443cae633b6fc1c (patch)
tree366e95790e66fcc2d916052b1b5150e70239c3c5 /arch/arm
parentLinux 5.16-rc7 (diff)
parentefi: Move efifb_setup_from_dmi() prototype from arch headers (diff)
downloadlinux-dev-a8ad9a2434dc7967ab285437f443cae633b6fc1c.tar.xz
linux-dev-a8ad9a2434dc7967ab285437f443cae633b6fc1c.zip
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 'arch/arm')
-rw-r--r--arch/arm/include/asm/efi.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/include/asm/efi.h b/arch/arm/include/asm/efi.h
index a6f3b179e8a9..27218eabbf9a 100644
--- a/arch/arm/include/asm/efi.h
+++ b/arch/arm/include/asm/efi.h
@@ -17,7 +17,6 @@
#ifdef CONFIG_EFI
void efi_init(void);
-extern void efifb_setup_from_dmi(struct screen_info *si, const char *opt);
int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md);
int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md);