merge mainline into nestpart

partmap/acorn.c

@@ -134,12 +134,12 @@ static struct grub_partition_map grub_acorn_partition_map =
   .iterate = acorn_partition_map_iterate,
 };
 
-GRUB_MOD_INIT(acorn_partition_map)
+GRUB_MOD_INIT(part_acorn)
 {
   grub_partition_map_register (&grub_acorn_partition_map);
 }
 
-GRUB_MOD_FINI(acorn_partition_map)
+GRUB_MOD_FINI(part_acorn)
 {
   grub_partition_map_unregister (&grub_acorn_partition_map);
 }

partmap/amiga.c

@@ -140,12 +140,12 @@ static struct grub_partition_map grub_amiga_partition_map =
     .iterate = amiga_partition_map_iterate,
   };
 
-GRUB_MOD_INIT(amiga_partition_map)
+GRUB_MOD_INIT(part_amiga)
 {
   grub_partition_map_register (&grub_amiga_partition_map);
 }
 
-GRUB_MOD_FINI(amiga_partition_map)
+GRUB_MOD_FINI(part_amiga)
 {
   grub_partition_map_unregister (&grub_amiga_partition_map);
 }

partmap/apple.c

@@ -185,12 +185,12 @@ static struct grub_partition_map grub_apple_partition_map =
     .iterate = apple_partition_map_iterate,
   };
 
-GRUB_MOD_INIT(apple_partition_map)
+GRUB_MOD_INIT(part_apple)
 {
   grub_partition_map_register (&grub_apple_partition_map);
 }
 
-GRUB_MOD_FINI(apple_partition_map)
+GRUB_MOD_FINI(part_apple)
 {
   grub_partition_map_unregister (&grub_apple_partition_map);
 }

partmap/bsdlabel.c

@@ -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);
 }

partmap/gpt.c

@@ -116,12 +116,12 @@ static struct grub_partition_map grub_gpt_partition_map =
     .iterate = gpt_partition_map_iterate,
   };
 
-GRUB_MOD_INIT(gpt_partition_map)
+GRUB_MOD_INIT(part_gpt)
 {
   grub_partition_map_register (&grub_gpt_partition_map);
 }
 
-GRUB_MOD_FINI(gpt_partition_map)
+GRUB_MOD_FINI(part_gpt)
 {
   grub_partition_map_unregister (&grub_gpt_partition_map);
 }

partmap/msdos.c

@@ -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);
 }

partmap/sun.c

@@ -152,12 +152,12 @@ static struct grub_partition_map grub_sun_partition_map =
     .iterate = sun_partition_map_iterate,
   };
 
-GRUB_MOD_INIT(sun_partition_map)
+GRUB_MOD_INIT(part_sun)
 {
   grub_partition_map_register (&grub_sun_partition_map);
 }
 
-GRUB_MOD_FINI(sun_partition_map)
+GRUB_MOD_FINI(part_sun)
 {
   grub_partition_map_unregister (&grub_sun_partition_map);
 }