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

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
H. Peter Anvin 2013-03-23 21:49:51 -07:00
commit b9726d9df8

View File

@ -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);