diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-23 13:11:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-23 13:11:50 -0500 |
| commit | 8f43d8e1147406901b7d972d1b528d94def23b0e (patch) | |
| tree | 8e0667ce322b79c6a9aade51dc9739f3dc9430fe /fs | |
| parent | 7b3dad3d854654e470a598d361919ebdb858f37b (diff) | |
| parent | 597d1f0622d21ffe54aceef8da9682e776f51cc2 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'fs')
| -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 deb25b661f04..656bc43431b9 100644 --- a/fs/partitions/Kconfig +++ b/fs/partitions/Kconfig | |||
| @@ -203,7 +203,7 @@ config ULTRIX_PARTITION | |||
| 203 | 203 | ||
| 204 | config SUN_PARTITION | 204 | config SUN_PARTITION |
| 205 | bool "Sun partition tables support" if PARTITION_ADVANCED | 205 | bool "Sun partition tables support" if PARTITION_ADVANCED |
| 206 | default y if (SPARC32 || SPARC64 || SUN3 || SUN3X) | 206 | default y if (SPARC || SUN3 || SUN3X) |
| 207 | ---help--- | 207 | ---help--- |
| 208 | Like most systems, SunOS uses its own hard disk partition table | 208 | Like most systems, SunOS uses its own hard disk partition table |
| 209 | format, incompatible with all others. Saying Y here allows you to | 209 | format, incompatible with all others. Saying Y here allows you to |