diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 20:21:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 20:21:38 -0500 |
| commit | 200d018eff4be3a1fb9823441cfcebb7de86a677 (patch) | |
| tree | 76dc7b8643da0fc19208067c44e3f346f11f6cc8 /fs | |
| parent | eb991b39385c7b04923d701764a34694ec54b53d (diff) | |
| parent | f0647a52974daccbe20990fb6341f07792445fe0 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[PATCH] add STB810 support (Philips PNX8550-based)
[MIPS] Qemu now has an ELF loader.
[MIPS] Add GENERIC_HARDIRQS_NO__DO_IRQ for i8259 users
[MIPS] Optimize csum_partial for 64bit kernel
[MIPS] Optimize flow of csum_partial
[MIPS] Make csum_partial more readable
[MIPS] Rename SNI_RM200_PCI to just SNI_RM preparing for more RM machines
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 e478f1941831..74552c60b671 100644 --- a/fs/partitions/Kconfig +++ b/fs/partitions/Kconfig | |||
| @@ -194,7 +194,7 @@ config LDM_DEBUG | |||
| 194 | 194 | ||
| 195 | config SGI_PARTITION | 195 | config SGI_PARTITION |
| 196 | bool "SGI partition support" if PARTITION_ADVANCED | 196 | bool "SGI partition support" if PARTITION_ADVANCED |
| 197 | default y if (SGI_IP22 || SGI_IP27 || ((MACH_JAZZ || SNI_RM200_PCI) && !CPU_LITTLE_ENDIAN)) | 197 | default y if (SGI_IP22 || SGI_IP27 || ((MACH_JAZZ || SNI_RM) && !CPU_LITTLE_ENDIAN)) |
| 198 | help | 198 | help |
| 199 | Say Y here if you would like to be able to read the hard disk | 199 | Say Y here if you would like to be able to read the hard disk |
| 200 | partition table format used by SGI machines. | 200 | partition table format used by SGI machines. |