diff options
| author | Linus Torvalds | 2022-06-21 12:20:11 -0500 |
|---|---|---|
| committer | Linus Torvalds | 2022-06-21 12:20:11 -0500 |
| commit | ca1fdab7fd27eb069df1384b2850dcd0c2bebe8d (patch) | |
| tree | b43a92bd59ea3a0f6106031a95758e123bed5770 /drivers | |
| parent | 0273fd423b2fe10af96ff713273137c63a7736c0 (diff) | |
| parent | aa6d1ed107eba26f49933216cffe797253914132 (diff) | |
Merge tag 'efi-urgent-for-v5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
Pull EFI fixes from Ard Biesheuvel:
- remove pointless include of asm/efi.h, which does not exist on ia64
- fix DXE service marshalling prototype for mixed mode
* tag 'efi-urgent-for-v5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
efi/x86: libstub: Fix typo in __efi64_argmap* name
efi: sysfb_efi: remove unnecessary <asm/efi.h> include
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/efi/sysfb_efi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/firmware/efi/sysfb_efi.c b/drivers/firmware/efi/sysfb_efi.c index 4c7c9dd7733f..7882d4b3f2be 100644 --- a/drivers/firmware/efi/sysfb_efi.c +++ b/drivers/firmware/efi/sysfb_efi.c @@ -26,8 +26,6 @@ #include <linux/sysfb.h> #include <video/vga.h> -#include <asm/efi.h> - enum { OVERRIDE_NONE = 0x0, OVERRIDE_BASE = 0x1, |