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, 8 insertions, 39 deletions

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 2667a9dee11d..df3eacb5ca15 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -88,9 +88,6 @@ config GENERIC_HARDIRQS_NO__DO_IRQ
         bool
         def_bool y
 
-config ARCH_SUPPORTS_AOUT
-        def_bool y
-
 choice
         prompt "Kernel page size"
         default SPARC64_PAGE_SIZE_8KB
@@ -148,11 +145,6 @@ config HOTPLUG_CPU
 
 source "init/Kconfig"
 
-config SYSVIPC_COMPAT
-        bool
-        depends on COMPAT && SYSVIPC
-        default y
-
 config GENERIC_HARDIRQS
         bool
         default y
@@ -380,6 +372,10 @@ config SUN_OPENPROMFS
           To compile the /proc/openprom support as a module, choose M here: the
           module will be called openpromfs.  If unsure, choose M.
 
+menu "Executable file formats"
+
+source "fs/Kconfig.binfmt"
+
 config SPARC32_COMPAT
         bool "Kernel support for Linux/Sparc 32bit binary compatibility"
         help
@@ -392,37 +388,10 @@ config COMPAT
         default y
         select COMPAT_BINFMT_ELF
 
-config BINFMT_AOUT32
-        bool "Kernel support for 32-bit (ie. SunOS) a.out binaries"
-        depends on SPARC32_COMPAT && ARCH_SUPPORTS_AOUT
-        help
-          This allows you to run 32-bit a.out format binaries on your Ultra.
-          If you want to run SunOS binaries (see SunOS binary emulation below)
-          or other a.out binaries, say Y. If unsure, say N.
-
-menu "Executable file formats"
-
-source "fs/Kconfig.binfmt"
-
-config SUNOS_EMUL
-        bool "SunOS binary emulation"
-        depends on BINFMT_AOUT32
-        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.
-
-config SOLARIS_EMUL
-        tristate "Solaris binary emulation (EXPERIMENTAL)"
-        depends on SPARC32_COMPAT && NET && EXPERIMENTAL
-        help
-          This is experimental code which will enable you to run (many)
-          Solaris binaries on your SPARC Linux machine.
-
-          To compile this code as a module, choose M here: the
-          module will be called solaris.
+config SYSVIPC_COMPAT
+        bool
+        depends on COMPAT && SYSVIPC
+        default y
 
 endmenu