From ec0d9a0c01659e8717b1e1c959796b48d32d8594 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 20 Jul 1999 18:33:59 +0000 Subject: 1999-07-20 Roland McGrath * linux/dev/drivers/block/genhd.c (check_partition): Change message to say these are only the DOS partitions. * i386/linux/dev/include/linux/autoconf.h (CONFIG_BSD_DISKLABEL, CONFIG_SMD_DISKLABEL): #undef these. The dev/glue/block.c code deals with BSD disklabels and expects the Linux genhd.c code to handle only the DOS partitions; having genhd.c do BSD disklabels too just confuses things. --- i386/linux/dev/include/linux/autoconf.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'i386/linux') diff --git a/i386/linux/dev/include/linux/autoconf.h b/i386/linux/dev/include/linux/autoconf.h index eb8c84ce..5770582d 100644 --- a/i386/linux/dev/include/linux/autoconf.h +++ b/i386/linux/dev/include/linux/autoconf.h @@ -94,7 +94,7 @@ #undef CONFIG_SKB_LARGE /* - * + * */ #undef CONFIG_IPX #undef CONFIG_ATALK @@ -238,8 +238,11 @@ #define CONFIG_AFFS_FS 1 #undef CONFIG_AMIGA_PARTITION #define CONFIG_UFS_FS 1 -#define CONFIG_BSD_DISKLABEL 1 -#define CONFIG_SMD_DISKLABEL 1 + +/* We want Linux's partitioning code to do only the DOS partition table, + since the Mach glue code does BSD disklabels for us. */ +#undef CONFIG_BSD_DISKLABEL +#undef CONFIG_SMD_DISKLABEL /* * Character devices -- cgit v1.2.3