summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2015-01-12 09:33:25 +0000
committerMatt Fleming <matt.fleming@intel.com>2015-01-12 09:33:25 +0000
commit17473c32ce23568d39b076bf56159894bea1c61f (patch)
treea0f37ab2301332d57b8632603d8835a1564f3acc /fs
parent62c204ddfe9649f0b1d273549f4bd68c23ed7c0d (diff)
parent26e022727f5e88c6e5054e14d954425deacbe56a (diff)
downloadlinux-17473c32ce23568d39b076bf56159894bea1c61f.tar.bz2
Merge tag 'rneri-efi-next' of https://github.com/ricardon/efi into next
Pull EFI changes for v3.20 from Ricardo Neri, who kindly picked them up while I was out on annual leave in December. Updates included: *Rename the function efi_guid_unparse to reflect better its behavior. - Borislav Petkov *Update the EFI firmware Kconfig help with the URL of efibootmgr. - Peter Jones Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/efivarfs/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
index 6dad1176ec52..ddbce42548c9 100644
--- a/fs/efivarfs/super.c
+++ b/fs/efivarfs/super.c
@@ -140,7 +140,7 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,
name[len] = '-';
- efi_guid_unparse(&entry->var.VendorGuid, name + len + 1);
+ efi_guid_to_str(&entry->var.VendorGuid, name + len + 1);
name[len + EFI_VARIABLE_GUID_LEN+1] = '\0';