diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-12 09:27:18 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-12 09:27:18 +0800 |
| commit | 334ca3ed18ded942e0220719f70b80eb20fa48ec (patch) | |
| tree | 16e6d4a8342db2ff94505cb0dba60cd2fa1587bf /drivers/firmware/efi/efi.c | |
| parent | bab15641824ad77e5f3af9cc4b84308cba32aa7d (diff) | |
| parent | 9ba733e2628196c5f211875122c8fc6de108c19e (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/firmware/efi/efi.c')
| -rw-r--r-- | drivers/firmware/efi/efi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 027ca212179f..3b52677f459a 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -180,6 +180,7 @@ static int generic_ops_register(void) { generic_ops.get_variable = efi.get_variable; generic_ops.set_variable = efi.set_variable; + generic_ops.set_variable_nonblocking = efi.set_variable_nonblocking; generic_ops.get_next_variable = efi.get_next_variable; generic_ops.query_variable_store = efi_query_variable_store; |