summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <tschwinge@gnu.org>2006-02-01 22:38:17 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-06-18 00:26:31 +0200
commitfe6fa0d9061225de3e2dac1debcd7649c8f89b34 (patch)
tree86197ff778a7e1f65a621a875b29306190ee486e
parentea36fbbca63aae230fa877cfec5d94046a11d6a1 (diff)
2006-02-01 Thomas Schwinge <tschwinge@gnu.org>
* linux/dev/drivers/block/genhd.c (add_bsd_partition): Only define if both MACH and CONFIG_BSD_DISKLABEL are defined. Reported by Matheus Morais <matheus.morais@gmail.com>.
-rw-r--r--ChangeLog6
-rw-r--r--linux/dev/drivers/block/genhd.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c93aab0..3482cc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-01 Thomas Schwinge <tschwinge@gnu.org>
+
+ * linux/dev/drivers/block/genhd.c (add_bsd_partition): Only define if
+ both MACH and CONFIG_BSD_DISKLABEL are defined.
+ Reported by Matheus Morais <matheus.morais@gmail.com>.
+
2006-01-31 Thomas Schwinge <tschwinge@gnu.org>
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,