diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /arch/sparc64/Kconfig | |
parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) |
Merge branch 'master'
Diffstat (limited to 'arch/sparc64/Kconfig')
-rw-r--r-- | arch/sparc64/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index a7a111db25b2..8a36ba8868db 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
@@ -334,7 +334,7 @@ config COMPAT | |||
334 | default y | 334 | default y |
335 | 335 | ||
336 | config BINFMT_ELF32 | 336 | config BINFMT_ELF32 |
337 | tristate "Kernel support for 32-bit ELF binaries" | 337 | bool "Kernel support for 32-bit ELF binaries" |
338 | depends on SPARC32_COMPAT | 338 | depends on SPARC32_COMPAT |
339 | help | 339 | help |
340 | This allows you to run 32-bit Linux/ELF binaries on your Ultra. | 340 | This allows you to run 32-bit Linux/ELF binaries on your Ultra. |