summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2013-03-23 21:49:51 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2013-03-23 21:49:51 -0700
commitb9726d9df8263fe756d2293ff01906f41f7d2776 (patch)
tree531698e20372c23cc828ba18e156db7d5e6b8c65
parent625f6ac9cf2aa567e398a6c9a70cc8c33e0a054f (diff)
parentca0ba26fbbd2d81c43085df49ce0abfe34535a90 (diff)
Merge tag 'efi-for-3.9-rc4' into x86/urgent
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--drivers/firmware/efivars.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index d64661fda4fd..7acafb80fd4c 100644
--- 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);