Commit b9726d9d authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

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



Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parents 625f6ac9 ca0ba26f

drivers/firmware/efivars.c

+1 −1
Original line number Diff line number Diff line
@@ -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);