Merge tag 'v3.9' into efi-for-tip2

[karo-tx-linux.git] / drivers / firmware / efi / efivars.c

diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
index 70635b3b59d39d8751ceb4848d56ca962eb8f210..f8f5e5d9e020013802e6f6464874d6ffd8cb5feb 100644 (file)
--- a/drivers/firmware/efi/efivars.c
+++ b/drivers/firmware/efi/efivars.c
@@ -67,6 +67,7 @@
 
 #include <linux/efi.h>
 #include <linux/module.h>
+#include <linux/ucs2_string.h>
 
 #define EFIVARS_VERSION "0.08"
 #define EFIVARS_DATE "2004-May-17"
@@ -407,7 +408,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
        efi_char16_t *variable_name;
 
        variable_name = new_var->var.VariableName;
-       variable_name_size = utf16_strlen(variable_name) * sizeof(efi_char16_t);
+       variable_name_size = ucs2_strlen(variable_name) * sizeof(efi_char16_t);
 
        /*
         * Length of the variable bytes in ASCII, plus the '-' separator,