Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[powerpc.git] / fs / partitions / Kconfig

diff --git a/fs/partitions/Kconfig b/fs/partitions/Kconfig
index e478f19..0120704 100644 (file)
--- a/fs/partitions/Kconfig
+++ b/fs/partitions/Kconfig
@@ -194,7 +194,7 @@ config LDM_DEBUG
 
 config SGI_PARTITION
        bool "SGI partition support" if PARTITION_ADVANCED
-       default y if (SGI_IP22 || SGI_IP27 || ((MACH_JAZZ || SNI_RM200_PCI) && !CPU_LITTLE_ENDIAN))
+       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.
@@ -235,5 +235,13 @@ config EFI_PARTITION
        select CRC32
        help
          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.
+         were partitioned using EFI GPT.
+
+config SYSV68_PARTITION
+       bool "SYSV68 partition table support" if PARTITION_ADVANCED
+       default y if M68K
+       help
+         Say Y here if you would like to be able to read the hard disk
+         partition table format used by Motorola Delta machines (using
+         sysv68).
+         Otherwise, say N.