From fe6fa0d9061225de3e2dac1debcd7649c8f89b34 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 1 Feb 2006 22:38:17 +0000 Subject: 2006-02-01 Thomas Schwinge * linux/dev/drivers/block/genhd.c (add_bsd_partition): Only define if both MACH and CONFIG_BSD_DISKLABEL are defined. Reported by Matheus Morais . --- ChangeLog | 6 ++++++ linux/dev/drivers/block/genhd.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c93aab0..3482cc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-01 Thomas Schwinge + + * linux/dev/drivers/block/genhd.c (add_bsd_partition): Only define if + both MACH and CONFIG_BSD_DISKLABEL are defined. + Reported by Matheus Morais . + 2006-01-31 Thomas Schwinge Cleanup of GNU Mach's build system. The system dependent parts are now diff --git a/linux/dev/drivers/block/genhd.c b/linux/dev/drivers/block/genhd.c index 2eb221b..3946b39 100644 --- a/linux/dev/drivers/block/genhd.c +++ b/linux/dev/drivers/block/genhd.c @@ -111,7 +111,7 @@ static void add_partition (struct gendisk *hd, int minor, int start, int size) printk(" %s", disk_name(hd, minor, buf)); } -#ifdef MACH +#if defined (MACH) && defined (CONFIG_BSD_DISKLABEL) static int mach_minor; static void add_bsd_partition (struct gendisk *hd, int minor, int slice, -- cgit v1.2.3