diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-06-02 08:38:11 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-06-02 08:38:11 +0200 |
commit | 6b33033c2482b439674807fe546bf2d4ed94a43e (patch) | |
tree | 53f914cdf1b3f821cac353bff03888eeab0a74de /drivers/firmware/efi/Makefile | |
parent | c46a024ea5eb0165114dbbc8c82c29b7bcf66e71 (diff) | |
parent | c208358c2cc832eeb5b341a465eee30be19cd5a0 (diff) | |
download | op-kernel-dev-6b33033c2482b439674807fe546bf2d4ed94a43e.zip op-kernel-dev-6b33033c2482b439674807fe546bf2d4ed94a43e.tar.gz |
Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/efi
Pull EFI changes from Matt Fleming:
- Use idiomatic negative error values in efivar_create_sysfs_entry()
instead of returning '1' to indicate error. (Dan Carpenter)
- Implement new support to expose the EFI System Resource Tables in sysfs,
which provides information for performing firmware updates. (Peter Jones)
- Documentation cleanup in the EFI handover protocol section which
falsely claimed that 'cmdline_size' needed to be filled out by the
boot loader. (Alex Smith)
- Align the order of SMBIOS tables in /sys/firmware/efi/systab to match
the way that we do things for ACPI and add documentation to
Documentation/ABI. (Jean Delvare)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firmware/efi/Makefile')
-rw-r--r-- | drivers/firmware/efi/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile index d8be608..26eabbc 100644 --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile @@ -1,7 +1,7 @@ # # Makefile for linux kernel # -obj-$(CONFIG_EFI) += efi.o vars.o reboot.o +obj-$(CONFIG_EFI) += efi.o esrt.o vars.o reboot.o obj-$(CONFIG_EFI_VARS) += efivars.o obj-$(CONFIG_EFI_VARS_PSTORE) += efi-pstore.o obj-$(CONFIG_UEFI_CPER) += cper.o |