merge mainline into emu-mod

This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-02-07 03:06:33 +01:00
commit 19a9fb834b
459 files changed
+26481 -7640

No files matched your search

+2 -9
View File
@@ -85,7 +85,7 @@ acorn_partition_map_find (grub_disk_t disk, struct linux_part *m,
fail:
return grub_error (GRUB_ERR_BAD_PART_TABLE,
"Linux/ADFS partition map not found.");
"Linux/ADFS partition map not found");
}
@@ -175,14 +175,7 @@ fail:
static char *
acorn_partition_map_get_name (const grub_partition_t p)
{
char *name;
name = grub_malloc (13);
if (! name)
return 0;
grub_sprintf (name, "%d", p->index + 1);
return name;
return grub_xasprintf ("%d", p->index + 1);
}