Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts

[cascardo/linux.git] / drivers / firmware / efi / Kconfig

diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index 730f5f2..1e75f48 100644 (file)
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -36,9 +36,6 @@ config EFI_VARS_PSTORE_DEFAULT_DISABLE
          backend for pstore by default. This setting can be overridden
          using the efivars module's pstore_disable parameter.
 
-config UEFI_CPER
-       def_bool n
-
 config EFI_RUNTIME_MAP
        bool "Export efi runtime maps to sysfs"
        depends on X86 && EFI && KEXEC
@@ -51,3 +48,6 @@ config EFI_RUNTIME_MAP
          See also Documentation/ABI/testing/sysfs-firmware-efi-runtime-map.
 
 endmenu
+
+config UEFI_CPER
+       bool