diff options
author | Jan Beulich <JBeulich@suse.com> | 2013-12-16 15:39:40 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-12-19 21:32:46 +0100 |
commit | fce7d3bfc0ae70ca2a57868f2a9708b13185fd1f (patch) | |
tree | e592054afc2f8dbed50ca1c1b09e4781ee4b69d8 /drivers/firmware/Makefile | |
parent | x86 idle: Repair large-server 50-watt idle-power regression (diff) | |
download | linux-fce7d3bfc0ae70ca2a57868f2a9708b13185fd1f.tar.xz linux-fce7d3bfc0ae70ca2a57868f2a9708b13185fd1f.zip |
x86/efi: Don't select EFI from certain special ACPI drivers
Commit 7ea6c6c1 ("Move cper.c from drivers/acpi/apei to
drivers/firmware/efi") results in CONFIG_EFI being enabled even
when the user doesn't want this. Since ACPI APEI used to build
fine without UEFI (and as far as I know also has no functional
depency on it), at least in that case using a reverse dependency
is wrong (and a straight one isn't needed).
Whether the same is true for ACPI_EXTLOG I don't know - if there
is a functional dependency, it should depend on EFI rather than
selecting it. It certainly has (currently) no build dependency.
Adjust Kconfig and build logic so that the bad dependency gets
avoided.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Tony Luck <tony.luck@intel.com>
Cc: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/52AF1EBC020000780010DBF9@nat28.tlf.novell.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firmware/Makefile')
-rw-r--r-- | drivers/firmware/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index 299fad6b5867..5373dc5b6011 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -14,3 +14,4 @@ obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o obj-$(CONFIG_GOOGLE_FIRMWARE) += google/ obj-$(CONFIG_EFI) += efi/ +obj-$(CONFIG_UEFI_CPER) += efi/ |