diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 20:29:39 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 20:29:39 +0300 |
| commit | f3aafa6c2535d36542a6dfc8647cd2fdb5999648 (patch) | |
| tree | 6d0ffd38855ffe3710a05b169587438447ebebc0 /arch/sparc64/Kconfig | |
| parent | 3668805a544a6229d6135a4427b8dfe7c343b61f (diff) | |
| parent | 48c946a482661d8466cd24bae5df749147ff1b1d (diff) | |
| download | linux-f3aafa6c2535d36542a6dfc8647cd2fdb5999648.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Make use of the new fs/compat_binfmt_elf.c
[SPARC64]: Make use of compat_sys_ptrace()
Manually fixed trivial delete/modift conflict in arch/sparc64/kernel/binfmt_elf32.c
Diffstat (limited to 'arch/sparc64/Kconfig')
| -rw-r--r-- | arch/sparc64/Kconfig | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index 5023b815e522..b810f2b7526a 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig @@ -383,13 +383,7 @@ config COMPAT bool depends on SPARC32_COMPAT default y - -config BINFMT_ELF32 - bool "Kernel support for 32-bit ELF binaries" - depends on SPARC32_COMPAT - help - This allows you to run 32-bit Linux/ELF binaries on your Ultra. - Everybody wants this; say Y. + select COMPAT_BINFMT_ELF config BINFMT_AOUT32 bool "Kernel support for 32-bit (ie. SunOS) a.out binaries" |