diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-03-24 00:49:51 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-03-24 00:49:51 -0400 |
| commit | b9726d9df8263fe756d2293ff01906f41f7d2776 (patch) | |
| tree | 531698e20372c23cc828ba18e156db7d5e6b8c65 | |
| parent | 625f6ac9cf2aa567e398a6c9a70cc8c33e0a054f (diff) | |
| parent | ca0ba26fbbd2d81c43085df49ce0abfe34535a90 (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.c | 2 |
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); | |||
| 104 | #define GUID_LEN 36 | 104 | #define GUID_LEN 36 |
| 105 | 105 | ||
| 106 | static bool efivars_pstore_disable = | 106 | static bool efivars_pstore_disable = |
| 107 | IS_ENABLED(EFI_VARS_PSTORE_DEFAULT_DISABLE); | 107 | IS_ENABLED(CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE); |
| 108 | 108 | ||
| 109 | module_param_named(pstore_disable, efivars_pstore_disable, bool, 0644); | 109 | module_param_named(pstore_disable, efivars_pstore_disable, bool, 0644); |
| 110 | 110 | ||