3 files changed, 7 insertions, 7 deletions

diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index f712d47f30d8..8de4da5c9ab6 100644
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -12,11 +12,11 @@ config EFI_VARS
 
           Note that using this driver in concert with efibootmgr requires
           at least test release version 0.5.0-test3 or later, which is
-          available from Matt Domsch's website located at:
+          available from:
           <http://linux.dell.com/efibootmgr/testing/efibootmgr-0.5.0-test3.tar.gz>
 
           Subsequent efibootmgr releases may be found at:
-          <http://linux.dell.com/efibootmgr>
+          <http://github.com/vathpela/efibootmgr>
 
 config EFI_VARS_PSTORE
         tristate "Register efivars backend for pstore"
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 8590099ac148..ff0bbe383b31 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -272,10 +272,10 @@ static __init int match_config_table(efi_guid_t *guid,
         int i;
 
         if (table_types) {
-                efi_guid_unparse(guid, str);
+                efi_guid_to_str(guid, str);
 
                 for (i = 0; efi_guidcmp(table_types[i].guid, NULL_GUID); i++) {
-                        efi_guid_unparse(&table_types[i].guid, str);
+                        efi_guid_to_str(&table_types[i].guid, str);
 
                         if (!efi_guidcmp(*guid, table_types[i].guid)) {
                                 *(table_types[i].ptr) = table;
diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
index f256ecd8a176..7b2e0496e0c0 100644
--- a/drivers/firmware/efi/efivars.c
+++ b/drivers/firmware/efi/efivars.c
@@ -39,7 +39,7 @@
  *   fix locking per Peter Chubb's findings
  *
  *  25 Mar 2002 - Matt Domsch <Matt_Domsch@dell.com>
- *   move uuid_unparse() to include/asm-ia64/efi.h:efi_guid_unparse()
+ *   move uuid_unparse() to include/asm-ia64/efi.h:efi_guid_to_str()
  *
  *  12 Feb 2002 - Matt Domsch <Matt_Domsch@dell.com>
  *   use list_for_each_safe when deleting vars.
@@ -128,7 +128,7 @@ efivar_guid_read(struct efivar_entry *entry, char *buf)
         if (!entry || !buf)
                 return 0;
 
-        efi_guid_unparse(&var->VendorGuid, str);
+        efi_guid_to_str(&var->VendorGuid, str);
         str += strlen(str);
         str += sprintf(str, "\n");
 
@@ -569,7 +569,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
            private variables from another's.         */
 
         *(short_name + strlen(short_name)) = '-';
-        efi_guid_unparse(&new_var->var.VendorGuid,
+        efi_guid_to_str(&new_var->var.VendorGuid,
                          short_name + strlen(short_name));
 
         new_var->kobj.kset = efivars_kset;