--- original/gnumach-20050801/linux/dev/drivers/block/genhd.c	1999-07-20 15:33:55.000000000 -0300
+++ gnumach-20050801/linux/dev/drivers/block/genhd.c	2006-01-30 15:10:23.847883856 -0200
@@ -111,18 +111,6 @@
 	printk(" %s", disk_name(hd, minor, buf));
 }
 
-#ifdef MACH
-static int mach_minor;
-static void
-add_bsd_partition (struct gendisk *hd, int minor, int slice,
-		   int start, int size)
-{
-  char buf[16];
-  hd->part[minor].start_sect = start;
-  hd->part[minor].nr_sects = size;
-  printk (" %s%c", disk_name (hd, mach_minor, buf), slice);
-}
-#endif
 
 static inline int is_extended_partition(struct partition *p)
 {
@@ -258,6 +246,16 @@
 
 		if (p->p_fstype != BSD_FS_UNUSED) {
 #ifdef MACH
+static int mach_minor;
+static void
+add_bsd_partition (struct gendisk *hd, int minor, int slice,
+		   int start, int size)
+{
+  char buf[16];
+  hd->part[minor].start_sect = start;
+  hd->part[minor].nr_sects = size;
+  printk (" %s%c", disk_name (hd, mach_minor, buf), slice);
+}
 		  add_bsd_partition (hd, current_minor,
 				     p - &l->d_partitions[0] + 'a',
 				     p->p_offset, p->p_size);