diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:20:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:20:37 -0400 |
| commit | 23946a8a980d13af7b84bcf3ce023e0d166ec83f (patch) | |
| tree | 193d2959a7b62b48aaf2236447f1378779e55104 /fs/partitions | |
| parent | 66e8bb97055ff22a0e5ea89c0a75a35f8738cc96 (diff) | |
| parent | 2b14c30b46e007a16c665cc86329bf4a1d9ff6ee (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'fs/partitions')
| -rw-r--r-- | fs/partitions/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/partitions/Kconfig b/fs/partitions/Kconfig index c9a478099281..e478f1941831 100644 --- a/fs/partitions/Kconfig +++ b/fs/partitions/Kconfig | |||
| @@ -99,7 +99,7 @@ config IBM_PARTITION | |||
| 99 | 99 | ||
| 100 | config MAC_PARTITION | 100 | config MAC_PARTITION |
| 101 | bool "Macintosh partition map support" if PARTITION_ADVANCED | 101 | bool "Macintosh partition map support" if PARTITION_ADVANCED |
| 102 | default y if MAC | 102 | default y if (MAC || PPC_PMAC) |
| 103 | help | 103 | help |
| 104 | Say Y here if you would like to use hard disks under Linux which | 104 | Say Y here if you would like to use hard disks under Linux which |
| 105 | were partitioned on a Macintosh. | 105 | were partitioned on a Macintosh. |