Merge branch 'acpi-ec'

[linux-drm-fsl-dcu.git] / include / linux / efi.h

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 0238d612750e9f14b7b5d2cb15e6560061adcc0e..b674837e2b98df15b34d3351e0ac477f128c5928 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -848,7 +848,7 @@ efi_guidcmp (efi_guid_t left, efi_guid_t right)
 }
 
 static inline char *
-efi_guid_unparse(efi_guid_t *guid, char *out)
+efi_guid_to_str(efi_guid_t *guid, char *out)
 {
        sprintf(out, "%pUl", guid->b);
         return out;