From 0000a5dbcf9c0ae77d1fc4a3e9c1c71da91edcc1 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 1 Sep 2013 03:23:03 +0000 Subject: [PATCH] Clean up efivars config symbols Enable EFI_VARS at the top-level config (still dependent on EFI). Explicitly disable EFI_VARS_PSTORE_DEFAULT_DISABLE. svn path=/dists/trunk/linux/; revision=20545 --- debian/config/config | 7 +++++++ debian/config/ia64/config | 1 - debian/config/kernelarch-x86/config | 2 -- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/config/config b/debian/config/config index 5c454e4c2..9e7a02505 100644 --- a/debian/config/config +++ b/debian/config/config @@ -391,6 +391,13 @@ CONFIG_FIREWIRE_SBP2=m CONFIG_FIREWIRE_NET=m CONFIG_FIREWIRE_NOSY=m +## +## file: drivers/firmware/Kconfig +## +CONFIG_EFI_VARS=m +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set + ## ## file: drivers/gpio/Kconfig ## diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 59984feec..25b394ae8 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -155,7 +155,6 @@ CONFIG_IPMI_POWEROFF=m ## file: drivers/firmware/Kconfig ## CONFIG_EFI_VARS=y -CONFIG_EFI_VARS_PSTORE=y CONFIG_DMIID=y ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 9c7120217..f17c21f0e 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -414,8 +414,6 @@ CONFIG_EDAC_AMD8111=m ## CONFIG_EDD=m # CONFIG_EDD_OFF is not set -CONFIG_EFI_VARS=m -CONFIG_EFI_VARS_PSTORE=y CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y