diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /fs/partitions | |
parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) |
Merge with Linux 2.3.32.
Diffstat (limited to 'fs/partitions')
-rw-r--r-- | fs/partitions/Config.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/partitions/Config.in b/fs/partitions/Config.in index c07773786..de35b3d57 100644 --- a/fs/partitions/Config.in +++ b/fs/partitions/Config.in @@ -18,7 +18,8 @@ else define_bool CONFIG_MSDOS_PARTITION y fi fi -if [ "$CONFIG_MSDOS_PARTITION" = "y" ]; then +if [ "$CONFIG_PARTITION_ADVANCED" = "y" -a \ + "$CONFIG_MSDOS_PARTITION" = "y" ]; then bool ' BSD disklabel (FreeBSD partition tables) support' CONFIG_BSD_DISKLABEL bool ' Solaris (x86) partition table support' CONFIG_SOLARIS_X86_PARTITION bool ' Unixware slices support' CONFIG_UNIXWARE_DISKLABEL |