Merge branch 'upstream-fixes' into upstream

[pandora-kernel.git] / fs / partitions / Kconfig

diff --git a/fs/partitions/Kconfig b/fs/partitions/Kconfig
index 7490cc9..e478f19 100644 (file)
--- a/fs/partitions/Kconfig
+++ b/fs/partitions/Kconfig
@@ -99,7 +99,7 @@ config IBM_PARTITION
 
 config MAC_PARTITION
        bool "Macintosh partition map support" if PARTITION_ADVANCED
-       default y if 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.
@@ -222,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.
 
+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