Merge master.kernel.org:/home/rmk/linux-2.6-arm

1 files changed, 12 insertions, 8 deletions

diff --git a/fs/partitions/Kconfig b/fs/partitions/Kconfig
index e227a04261ab..7490cc9208b3 100644
--- a/fs/partitions/Kconfig
+++ b/fs/partitions/Kconfig
@@ -21,26 +21,30 @@ config ACORN_PARTITION
           Support hard disks partitioned under Acorn operating systems.
 
 config ACORN_PARTITION_CUMANA
-        bool "Cumana partition support" if PARTITION_ADVANCED && ACORN_PARTITION
+        bool "Cumana partition support" if PARTITION_ADVANCED
         default y if ARCH_ACORN
+        depends on ACORN_PARTITION
         help
           Say Y here if you would like to use hard disks under Linux which
           were partitioned using the Cumana interface on Acorn machines.
 
 config ACORN_PARTITION_EESOX
-        bool "EESOX partition support" if PARTITION_ADVANCED && ACORN_PARTITION
+        bool "EESOX partition support" if PARTITION_ADVANCED
         default y if ARCH_ACORN
+        depends on ACORN_PARTITION
 
 config ACORN_PARTITION_ICS
-        bool "ICS partition support" if PARTITION_ADVANCED && ACORN_PARTITION
+        bool "ICS partition support" if PARTITION_ADVANCED
         default y if ARCH_ACORN
+        depends on ACORN_PARTITION
         help
           Say Y here if you would like to use hard disks under Linux which
           were partitioned using the ICS interface on Acorn machines.
 
 config ACORN_PARTITION_ADFS
-        bool "Native filecore partition support" if PARTITION_ADVANCED && ACORN_PARTITION
+        bool "Native filecore partition support" if PARTITION_ADVANCED
         default y if ARCH_ACORN
+        depends on ACORN_PARTITION
         help
           The Acorn Disc Filing System is the standard file system of the
           RiscOS operating system which runs on Acorn's ARM-based Risc PC
@@ -48,15 +52,17 @@ config ACORN_PARTITION_ADFS
           `Y' here, Linux will support disk partitions created under ADFS.
 
 config ACORN_PARTITION_POWERTEC
-        bool "PowerTec partition support" if PARTITION_ADVANCED && ACORN_PARTITION
+        bool "PowerTec partition support" if PARTITION_ADVANCED
         default y if ARCH_ACORN
+        depends on ACORN_PARTITION
         help
           Support reading partition tables created on Acorn machines using
           the PowerTec SCSI drive.
 
 config ACORN_PARTITION_RISCIX
-        bool "RISCiX partition support" if PARTITION_ADVANCED && ACORN_PARTITION
+        bool "RISCiX partition support" if PARTITION_ADVANCED
         default y if ARCH_ACORN
+        depends on ACORN_PARTITION
         help
           Once upon a time, there was a native Unix port for the Acorn series
           of machines called RISCiX.  If you say 'Y' here, Linux will be able
@@ -224,5 +230,3 @@ config EFI_PARTITION
           Say Y here if you would like to use hard disks under Linux which
           were partitioned using EFI GPT.  Presently only useful on the
           IA-64 platform.
-
-#      define_bool CONFIG_ACORN_PARTITION_CUMANA y