git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
partitions
/
Kconfig
diff --git
a/fs/partitions/Kconfig
b/fs/partitions/Kconfig
index
cf379e6
..
74552c6
100644
(file)
--- a/
fs/partitions/Kconfig
+++ b/
fs/partitions/Kconfig
@@
-16,31
+16,35
@@
config PARTITION_ADVANCED
config ACORN_PARTITION
bool "Acorn partition support" if PARTITION_ADVANCED
config ACORN_PARTITION
bool "Acorn partition support" if PARTITION_ADVANCED
- default y if
!PARTITION_ADVANCED &&
ARCH_ACORN
+ default y if ARCH_ACORN
help
Support hard disks partitioned under Acorn operating systems.
config ACORN_PARTITION_CUMANA
help
Support hard disks partitioned under Acorn operating systems.
config ACORN_PARTITION_CUMANA
- bool "Cumana partition support" if PARTITION_ADVANCED && ACORN_PARTITION
- default y if !PARTITION_ADVANCED && ARCH_ACORN
+ 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
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
- default y if !PARTITION_ADVANCED && ARCH_ACORN
+ bool "EESOX partition support" if PARTITION_ADVANCED
+ 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
- default y if !PARTITION_ADVANCED && ARCH_ACORN
+ 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
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
- default y if !PARTITION_ADVANCED && ARCH_ACORN
+ 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
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
`Y' here, Linux will support disk partitions created under ADFS.
config ACORN_PARTITION_POWERTEC
- bool "PowerTec partition support" if PARTITION_ADVANCED && ACORN_PARTITION
- default y if !PARTITION_ADVANCED && ARCH_ACORN
+ 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
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
- default y if !PARTITION_ADVANCED && ARCH_ACORN
+ 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
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
@@
-64,28
+70,28
@@
config ACORN_PARTITION_RISCIX
config OSF_PARTITION
bool "Alpha OSF partition support" if PARTITION_ADVANCED
config OSF_PARTITION
bool "Alpha OSF partition support" if PARTITION_ADVANCED
- default y if
!PARTITION_ADVANCED &&
ALPHA
+ default y if ALPHA
help
Say Y here if you would like to use hard disks under Linux which
were partitioned on an Alpha machine.
config AMIGA_PARTITION
bool "Amiga partition table support" if PARTITION_ADVANCED
help
Say Y here if you would like to use hard disks under Linux which
were partitioned on an Alpha machine.
config AMIGA_PARTITION
bool "Amiga partition table support" if PARTITION_ADVANCED
- default y if
!PARTITION_ADVANCED &&
(AMIGA || AFFS_FS=y)
+ default y if (AMIGA || AFFS_FS=y)
help
Say Y here if you would like to use hard disks under Linux which
were partitioned under AmigaOS.
config ATARI_PARTITION
bool "Atari partition table support" if PARTITION_ADVANCED
help
Say Y here if you would like to use hard disks under Linux which
were partitioned under AmigaOS.
config ATARI_PARTITION
bool "Atari partition table support" if PARTITION_ADVANCED
- default y if
!PARTITION_ADVANCED &&
ATARI
+ default y if ATARI
help
Say Y here if you would like to use hard disks under Linux which
were partitioned under the Atari OS.
config IBM_PARTITION
bool "IBM disk label and partition support"
help
Say Y here if you would like to use hard disks under Linux which
were partitioned under the Atari OS.
config IBM_PARTITION
bool "IBM disk label and partition support"
- depends on PARTITION_ADVANCED &&
ARCH_
S390
+ depends on PARTITION_ADVANCED && S390
help
Say Y here if you would like to be able to read the hard disk
partition table format used by IBM DASD disks operating under CMS.
help
Say Y here if you would like to be able to read the hard disk
partition table format used by IBM DASD disks operating under CMS.
@@
-93,17
+99,16
@@
config IBM_PARTITION
config MAC_PARTITION
bool "Macintosh partition map support" if PARTITION_ADVANCED
config MAC_PARTITION
bool "Macintosh partition map support" if PARTITION_ADVANCED
- default y if
!PARTITION_ADVANCED && MAC
+ default y if
(MAC || PPC_PMAC)
help
Say Y here if you would like to use hard disks under Linux which
were partitioned on a Macintosh.
config MSDOS_PARTITION
bool "PC BIOS (MSDOS partition tables) support" if PARTITION_ADVANCED
help
Say Y here if you would like to use hard disks under Linux which
were partitioned on a Macintosh.
config MSDOS_PARTITION
bool "PC BIOS (MSDOS partition tables) support" if PARTITION_ADVANCED
- default y
if !PARTITION_ADVANCED && !AMIGA && !ATARI && !MAC && !SGI_IP22 && !ARM && !SGI_IP27
+ default y
help
help
- Say Y here if you would like to use hard disks under Linux which
- were partitioned on an x86 PC (not necessarily by DOS).
+ Say Y here.
config BSD_DISKLABEL
bool "BSD disklabel (FreeBSD partition tables) support"
config BSD_DISKLABEL
bool "BSD disklabel (FreeBSD partition tables) support"
@@
-187,23
+192,16
@@
config LDM_DEBUG
If unsure, say N.
If unsure, say N.
-config NEC98_PARTITION
- bool "NEC PC-9800 partition table support" if PARTITION_ADVANCED
- default y if !PARTITION_ADVANCED && X86_PC9800
- help
- Say Y here if you would like to be able to read the hard disk
- partition table format used by NEC PC-9800 machines.
-
config SGI_PARTITION
bool "SGI partition support" if PARTITION_ADVANCED
config SGI_PARTITION
bool "SGI partition support" if PARTITION_ADVANCED
- default y if
!PARTITION_ADVANCED && (SGI_IP22 || SGI_IP27
)
+ default y if
(SGI_IP22 || SGI_IP27 || ((MACH_JAZZ || SNI_RM) && !CPU_LITTLE_ENDIAN)
)
help
Say Y here if you would like to be able to read the hard disk
partition table format used by SGI machines.
config ULTRIX_PARTITION
bool "Ultrix partition table support" if PARTITION_ADVANCED
help
Say Y here if you would like to be able to read the hard disk
partition table format used by SGI machines.
config ULTRIX_PARTITION
bool "Ultrix partition table support" if PARTITION_ADVANCED
- default y if
!PARTITION_ADVANCED &&
DECSTATION
+ default y if
MACH_
DECSTATION
help
Say Y here if you would like to be able to read the hard disk
partition table format used by DEC (now Compaq) Ultrix machines.
help
Say Y here if you would like to be able to read the hard disk
partition table format used by DEC (now Compaq) Ultrix machines.
@@
-211,7
+209,7
@@
config ULTRIX_PARTITION
config SUN_PARTITION
bool "Sun partition tables support" if PARTITION_ADVANCED
config SUN_PARTITION
bool "Sun partition tables support" if PARTITION_ADVANCED
- default y if
!PARTITION_ADVANCED && (SPARC32 || SPARC64
)
+ default y if
(SPARC || SUN3 || SUN3X
)
---help---
Like most systems, SunOS uses its own hard disk partition table
format, incompatible with all others. Saying Y here allows you to
---help---
Like most systems, SunOS uses its own hard disk partition table
format, incompatible with all others. Saying Y here allows you to
@@
-224,6
+222,13
@@
config SUN_PARTITION
given by the tar program ("man tar" or preferably "info tar"). If
you don't know what all this is about, say N.
given by the tar program ("man tar" or preferably "info tar"). If
you don't know what all this is about, say N.
+config KARMA_PARTITION
+ bool "Karma Partition support"
+ depends on PARTITION_ADVANCED
+ help
+ Say Y here if you would like to mount the Rio Karma MP3 player, as it
+ uses a proprietary partition table.
+
config EFI_PARTITION
bool "EFI GUID Partition support"
depends on PARTITION_ADVANCED
config EFI_PARTITION
bool "EFI GUID Partition support"
depends on PARTITION_ADVANCED
@@
-232,5
+237,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.
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