merge mainline into nestpart

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

No files matched your search

-14
View File
@@ -93,20 +93,6 @@ grub_partition_map_unregister (grub_partition_map_t partmap)
#define FOR_PARTITION_MAPS(var) for (var = grub_partition_map_list; var; var = var->next)
#ifdef GRUB_UTIL
void grub_msdos_partition_map_init (void);
void grub_msdos_partition_map_fini (void);
void grub_amiga_partition_map_init (void);
void grub_amiga_partition_map_fini (void);
void grub_apple_partition_map_init (void);
void grub_apple_partition_map_fini (void);
void grub_sun_partition_map_init (void);
void grub_sun_partition_map_fini (void);
void grub_gpt_partition_map_init (void);
void grub_gpt_partition_map_fini (void);
void grub_apple_partition_map_init (void);
void grub_apple_partition_map_fini (void);
#endif
static inline grub_disk_addr_t
grub_partition_get_start (const grub_partition_t p)