Commit 50365c57 authored by Russell King's avatar Russell King Committed by Russell King

[ARM] Make Acorn partition types depend on ACORN_PARTITION

balamurugan reported a problem where it was possible to have
the various Acorn partition types selected in the configuration,
but ACORN_PARTITION disabled.  Since ACORN_PARTITION controls
whether we build fs/partitions/acorn.c, this lead to undefined
references to the adfspart_check_TYPE symbols.

Fix this by making the Acorn partition type symbols depend on
ACORN_PARTITION.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 50465d0d
No related merge requests found
...@@ -21,26 +21,30 @@ config ACORN_PARTITION ...@@ -21,26 +21,30 @@ config ACORN_PARTITION
Support hard disks partitioned under Acorn operating systems. Support hard disks partitioned under Acorn operating systems.
config ACORN_PARTITION_CUMANA 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 default y if ARCH_ACORN
depends on ACORN_PARTITION
help help
Say Y here if you would like to use hard disks under Linux which Say Y here if you would like to use hard disks under Linux which
were partitioned using the Cumana interface on Acorn machines. were partitioned using the Cumana interface on Acorn machines.
config ACORN_PARTITION_EESOX 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 default y if ARCH_ACORN
depends on ACORN_PARTITION
config ACORN_PARTITION_ICS 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 default y if ARCH_ACORN
depends on ACORN_PARTITION
help help
Say Y here if you would like to use hard disks under Linux which Say Y here if you would like to use hard disks under Linux which
were partitioned using the ICS interface on Acorn machines. were partitioned using the ICS interface on Acorn machines.
config ACORN_PARTITION_ADFS 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 default y if ARCH_ACORN
depends on ACORN_PARTITION
help help
The Acorn Disc Filing System is the standard file system of the The Acorn Disc Filing System is the standard file system of the
RiscOS operating system which runs on Acorn's ARM-based Risc PC RiscOS operating system which runs on Acorn's ARM-based Risc PC
...@@ -48,15 +52,17 @@ config ACORN_PARTITION_ADFS ...@@ -48,15 +52,17 @@ config ACORN_PARTITION_ADFS
`Y' here, Linux will support disk partitions created under ADFS. `Y' here, Linux will support disk partitions created under ADFS.
config ACORN_PARTITION_POWERTEC 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 default y if ARCH_ACORN
depends on ACORN_PARTITION
help help
Support reading partition tables created on Acorn machines using Support reading partition tables created on Acorn machines using
the PowerTec SCSI drive. the PowerTec SCSI drive.
config ACORN_PARTITION_RISCIX 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 default y if ARCH_ACORN
depends on ACORN_PARTITION
help help
Once upon a time, there was a native Unix port for the Acorn series 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 of machines called RISCiX. If you say 'Y' here, Linux will be able
...@@ -224,5 +230,3 @@ config EFI_PARTITION ...@@ -224,5 +230,3 @@ config EFI_PARTITION
Say Y here if you would like to use hard disks under Linux which Say Y here if you would like to use hard disks under Linux which
were partitioned using EFI GPT. Presently only useful on the were partitioned using EFI GPT. Presently only useful on the
IA-64 platform. IA-64 platform.
# define_bool CONFIG_ACORN_PARTITION_CUMANA y
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment