Merge tag 'efi-for-3.9-rc4' into x86/urgent

Signed-off-by: N H. Peter Anvin <hpa@linux.intel.com>

Merge tag 'efi-for-3.9-rc4' into x86/urgent
Signed-off-by: N H. Peter Anvin <hpa@linux.intel.com>
b9726d9d · H. Peter Anvin · 625f6ac9 · ca0ba26f · b9726d9d
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

drivers/firmware/efivars.c drivers/firmware/efivars.c +1 -1

未找到文件。
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -104,7 +104,7 @@ MODULE_VERSION(EFIVARS_VERSION);
 #define GUID_LEN 36

 static bool efivars_pstore_disable =
-	IS_ENABLED(EFI_VARS_PSTORE_DEFAULT_DISABLE);
+	IS_ENABLED(CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE);

 module_param_named(pstore_disable, efivars_pstore_disable, bool, 0644);