diff options
| author | Roland McGrath <roland@gnu.org> | 1999-07-20 18:33:59 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1999-07-20 18:33:59 +0000 |
| commit | ec0d9a0c01659e8717b1e1c959796b48d32d8594 (patch) | |
| tree | c83a9297dcfa80472ab64a70f0605f1c88c6cd51 /i386/linux/dev | |
| parent | 74ccbe61fd6af5e2eb4fcdebefde6d86f005c05d (diff) | |
1999-07-20 Roland McGrath <roland@baalperazim.frob.com>
* 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.
Diffstat (limited to 'i386/linux/dev')
| -rw-r--r-- | i386/linux/dev/include/linux/autoconf.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/i386/linux/dev/include/linux/autoconf.h b/i386/linux/dev/include/linux/autoconf.h index eb8c84c..5770582 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 |