diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 20:20:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 20:20:53 -0400 |
commit | 8a3227268877b81096d7b7a841aaf51099ad2068 (patch) | |
tree | 73d2b9522aa981d46040b5603c824583c1b18694 /fs | |
parent | e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b (diff) | |
parent | ec98c6b9b47df6df1c1fa6cf3d427414f8c2cf16 (diff) |
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:
[SPARC]: Remove SunOS and Solaris binary support.
Diffstat (limited to 'fs')
-rw-r--r-- | fs/Kconfig.binfmt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt index b5c3b6114add..853845abcca6 100644 --- a/fs/Kconfig.binfmt +++ b/fs/Kconfig.binfmt | |||
@@ -62,7 +62,7 @@ config BINFMT_SHARED_FLAT | |||
62 | config BINFMT_AOUT | 62 | config BINFMT_AOUT |
63 | tristate "Kernel support for a.out and ECOFF binaries" | 63 | tristate "Kernel support for a.out and ECOFF binaries" |
64 | depends on ARCH_SUPPORTS_AOUT && \ | 64 | depends on ARCH_SUPPORTS_AOUT && \ |
65 | (X86_32 || ALPHA || ARM || M68K || SPARC32) | 65 | (X86_32 || ALPHA || ARM || M68K) |
66 | ---help--- | 66 | ---help--- |
67 | A.out (Assembler.OUTput) is a set of formats for libraries and | 67 | A.out (Assembler.OUTput) is a set of formats for libraries and |
68 | executables used in the earliest versions of UNIX. Linux used | 68 | executables used in the earliest versions of UNIX. Linux used |