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

@ -86,12 +86,12 @@ static struct grub_partition_map grub_bsdlabel_partition_map =
.iterate = bsdlabel_partition_map_iterate,
};
GRUB_MOD_INIT(bsd_partition_map)
GRUB_MOD_INIT(part_bsd)
{
grub_partition_map_register (&grub_bsdlabel_partition_map);
}
GRUB_MOD_FINI(bsd_partition_map)
GRUB_MOD_FINI(part_bsd)
{
grub_partition_map_unregister (&grub_bsdlabel_partition_map);
}