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

@ -138,7 +138,7 @@ static grub_err_t grub_pcpart_type (const grub_device_t dev,
return GRUB_ERR_NONE;
}
GRUB_MOD_INIT (pcpart)
GRUB_MOD_INIT (msdospart)
{
activate_table_handle = grub_parttool_register ("msdos",
grub_pcpart_boot,
@ -148,7 +148,7 @@ GRUB_MOD_INIT (pcpart)
grub_pcpart_typeargs);
}
GRUB_MOD_FINI(pcpart)
GRUB_MOD_FINI(msdospart)
{
grub_parttool_unregister (activate_table_handle);
grub_parttool_unregister (type_table_handle);