diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-16 16:47:38 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-16 16:47:38 -0700 |
commit | cc9b499a1f71696054a2771aae504c53eecff31d (patch) | |
tree | 96b18e65c38bfcacd2f03a9012bd5384e1c54bf2 /drivers/firmware/efi/Makefile | |
parent | 98c82b4b8be60b05bc96aa4ab664ca0b0e39001f (diff) | |
parent | d3dc0168e93233ba4d4ed9a2c506c9d2b8d8cd33 (diff) | |
download | lwn-cc9b499a1f71696054a2771aae504c53eecff31d.tar.gz lwn-cc9b499a1f71696054a2771aae504c53eecff31d.zip |
Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI updates from Ingo Molnar:
- refactor the EFI config table handling across architectures
- add support for the Dell EMC OEM config table
- include AER diagnostic output to CPER handling of fatal PCIe errors
* 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi: cper: print AER info of PCIe fatal error
efi: Export Runtime Configuration Interface table to sysfs
efi: ia64: move SAL systab handling out of generic EFI code
efi/x86: move UV_SYSTAB handling into arch/x86
efi: x86: move efi_is_table_address() into arch/x86
Diffstat (limited to 'drivers/firmware/efi/Makefile')
-rw-r--r-- | drivers/firmware/efi/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile index d2d0d2030620..4ac2de4dfa72 100644 --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_EFI_BOOTLOADER_CONTROL) += efibc.o obj-$(CONFIG_EFI_TEST) += test/ obj-$(CONFIG_EFI_DEV_PATH_PARSER) += dev-path-parser.o obj-$(CONFIG_APPLE_PROPERTIES) += apple-properties.o +obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o arm-obj-$(CONFIG_EFI) := arm-init.o arm-runtime.o obj-$(CONFIG_ARM) += $(arm-obj-y) |