merge mainline into nestpart

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-26 15:44:13 +01:00
commit c9ea504d25
170 changed files with 4270 additions and 3366 deletions

View file

@ -141,12 +141,12 @@ static struct grub_partition_map grub_msdos_partition_map =
.iterate = pc_partition_map_iterate,
};
GRUB_MOD_INIT(pc_partition_map)
GRUB_MOD_INIT(part_msdos)
{
grub_partition_map_register (&grub_msdos_partition_map);
}
GRUB_MOD_FINI(pc_partition_map)
GRUB_MOD_FINI(part_msdos)
{
grub_partition_map_unregister (&grub_msdos_partition_map);
}