aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 18:09:30 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 18:09:30 -0500
commit3995f4c5327595b51482bdac8c189736262eb6e0 (patch)
treeef768d0ecf243a2376bfc646b847964313146d3e /fs
parent05814450070f13b671fc9dbf89477677aa0258cb (diff)
parentfe38ea5623d262afc0b92ea47b8a7d8c988521d2 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'fs')
-rw-r--r--fs/partitions/Kconfig20
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
21 Support hard disks partitioned under Acorn operating systems. 21 Support hard disks partitioned under Acorn operating systems.
22 22
23config ACORN_PARTITION_CUMANA 23config ACORN_PARTITION_CUMANA
24 bool "Cumana partition support" if PARTITION_ADVANCED && ACORN_PARTITION 24 bool "Cumana partition support" if PARTITION_ADVANCED
25 default y if ARCH_ACORN 25 default y if ARCH_ACORN
26 depends on ACORN_PARTITION
26 help 27 help
27 Say Y here if you would like to use hard disks under Linux which 28 Say Y here if you would like to use hard disks under Linux which
28 were partitioned using the Cumana interface on Acorn machines. 29 were partitioned using the Cumana interface on Acorn machines.
29 30
30config ACORN_PARTITION_EESOX 31config ACORN_PARTITION_EESOX
31 bool "EESOX partition support" if PARTITION_ADVANCED && ACORN_PARTITION 32 bool "EESOX partition support" if PARTITION_ADVANCED
32 default y if ARCH_ACORN 33 default y if ARCH_ACORN
34 depends on ACORN_PARTITION
33 35
34config ACORN_PARTITION_ICS 36config ACORN_PARTITION_ICS
35 bool "ICS partition support" if PARTITION_ADVANCED && ACORN_PARTITION 37 bool "ICS partition support" if PARTITION_ADVANCED
36 default y if ARCH_ACORN 38 default y if ARCH_ACORN
39 depends on ACORN_PARTITION
37 help 40 help
38 Say Y here if you would like to use hard disks under Linux which 41 Say Y here if you would like to use hard disks under Linux which
39 were partitioned using the ICS interface on Acorn machines. 42 were partitioned using the ICS interface on Acorn machines.
40 43
41config ACORN_PARTITION_ADFS 44config ACORN_PARTITION_ADFS
42 bool "Native filecore partition support" if PARTITION_ADVANCED && ACORN_PARTITION 45 bool "Native filecore partition support" if PARTITION_ADVANCED
43 default y if ARCH_ACORN 46 default y if ARCH_ACORN
47 depends on ACORN_PARTITION
44 help 48 help
45 The Acorn Disc Filing System is the standard file system of the 49 The Acorn Disc Filing System is the standard file system of the
46 RiscOS operating system which runs on Acorn's ARM-based Risc PC 50 RiscOS operating system which runs on Acorn's ARM-based Risc PC
@@ -48,15 +52,17 @@ config ACORN_PARTITION_ADFS
48 `Y' here, Linux will support disk partitions created under ADFS. 52 `Y' here, Linux will support disk partitions created under ADFS.
49 53
50config ACORN_PARTITION_POWERTEC 54config ACORN_PARTITION_POWERTEC
51 bool "PowerTec partition support" if PARTITION_ADVANCED && ACORN_PARTITION 55 bool "PowerTec partition support" if PARTITION_ADVANCED
52 default y if ARCH_ACORN 56 default y if ARCH_ACORN
57 depends on ACORN_PARTITION
53 help 58 help
54 Support reading partition tables created on Acorn machines using 59 Support reading partition tables created on Acorn machines using
55 the PowerTec SCSI drive. 60 the PowerTec SCSI drive.
56 61
57config ACORN_PARTITION_RISCIX 62config ACORN_PARTITION_RISCIX
58 bool "RISCiX partition support" if PARTITION_ADVANCED && ACORN_PARTITION 63 bool "RISCiX partition support" if PARTITION_ADVANCED
59 default y if ARCH_ACORN 64 default y if ARCH_ACORN
65 depends on ACORN_PARTITION
60 help 66 help
61 Once upon a time, there was a native Unix port for the Acorn series 67 Once upon a time, there was a native Unix port for the Acorn series
62 of machines called RISCiX. If you say 'Y' here, Linux will be able 68 of machines called RISCiX. If you say 'Y' here, Linux will be able
@@ -224,5 +230,3 @@ config EFI_PARTITION
224 Say Y here if you would like to use hard disks under Linux which 230 Say Y here if you would like to use hard disks under Linux which
225 were partitioned using EFI GPT. Presently only useful on the 231 were partitioned using EFI GPT. Presently only useful on the
226 IA-64 platform. 232 IA-64 platform.
227
228# define_bool CONFIG_ACORN_PARTITION_CUMANA y