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.

1 files changed, 0 insertions, 12 deletions

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index c40343c54920..49590f8fe98c 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -27,9 +27,6 @@ config ARCH_NO_VIRT_TO_BUS
 config OF
         def_bool y
 
-config ARCH_SUPPORTS_AOUT
-        def_bool y
-
 config HZ
         int
         default 100
@@ -257,15 +254,6 @@ config SPARC_LED
 
 source "fs/Kconfig.binfmt"
 
-config SUNOS_EMUL
-        bool "SunOS binary emulation"
-        help
-          This allows you to run most SunOS binaries.  If you want to do this,
-          say Y here and place appropriate files in /usr/gnemul/sunos. See
-          <http://www.ultralinux.org/faq.html> for more information.  If you
-          want to run SunOS binaries on an Ultra you must also say Y to
-          "Kernel support for 32-bit a.out binaries" above.
-
 source "mm/Kconfig"
 
 endmenu