Remove redundant CONFIG_ARCH_SUPPORTS_AOUT

We don't need this any more; arguably we never really did.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 1bec55d63ef6241fb9451c821a09960657503acb..46f0ddfb78e2f95e044bef273dbb8a2896ad1652 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -68,9 +68,6 @@ config AUTO_IRQ_AFFINITY
        depends on SMP
        default y
 
-config ARCH_SUPPORTS_AOUT
-       def_bool y
-
 source "init/Kconfig"
 
 

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 70dba16689077dc0440cf12cc607f000bd5bdbdf..8803c39112b622a09314c567f21342b2bc3a54cd 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -140,9 +140,6 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
-config ARCH_SUPPORTS_AOUT
-       def_bool y
-
 config ARCH_MAY_HAVE_PC_FDC
        bool
 

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 396ab059efa35a9fa1d2e8258aff56cd0f8f0ab4..107cb5bb9f39f0b99a3ba2a0841d0a373a19dfbf 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -66,9 +66,6 @@ config TIME_LOW_RES
        bool
        default y
 
-config ARCH_SUPPORTS_AOUT
-       def_bool y
-
 config NO_IOPORT
        def_bool y
 

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index a5f864c445b2fe1a28f511dd2c033e4430fc0814..8a165cc1b732f5ba984c68051c1122dc68724d54 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -36,9 +36,6 @@ config NO_IOPORT
 config NO_DMA
        def_bool y
 
-config ARCH_SUPPORTS_AOUT
-       def_bool y
-
 config HZ
        int
        default 100

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 8c5e1de68fcb6737bbfb1995b21736ac379fa7cc..d42b996a24ad3bd5f9a896c9b55460c2e9c0dd33 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -53,9 +53,6 @@ config NO_IOPORT
 config NO_DMA
        def_bool SUN3
 
-config ARCH_SUPPORTS_AOUT
-       def_bool y
-
 config HZ
        int
        default 100

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 2e7515e8db985a9f4b50820edae74a643cf0f325..0a8998315e5ed9fcdada66d87c5ee1127e35b9ac 100644 (file)
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -73,9 +73,6 @@ config GENERIC_CLOCKEVENTS
 config NO_IOPORT
        def_bool y
 
-config ARCH_SUPPORTS_AOUT
-       def_bool y
-
 source "init/Kconfig"
 
 menu "Processor type and features"

diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index e856218da90d36098e719602be9ffaa78c28f606..dd557c9cf001be6226441b78cb84753f5e50cb15 100644 (file)
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -53,9 +53,6 @@ config QUICKLIST
 config ARCH_HAS_ILOG2_U32
        def_bool y
 
-config ARCH_SUPPORTS_AOUT
-       def_bool n
-
 # Use the generic interrupt handling code in kernel/irq/
 config GENERIC_HARDIRQS
        def_bool y

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index a7d4fd353c2b06fcaa8c7d6e1306e71b14ad440f..8313fccced5e1553f6f3d7ff484d897d2d20b812 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -76,9 +76,6 @@ config IRQ_PER_CPU
        bool
        default y
 
-config ARCH_SUPPORTS_AOUT
-       def_bool y
-
 # unless you want to implement ACPI on PA-RISC ... ;-)
 config PM
        bool

diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386
index e09edfa560da5c1ec5eb0d40f247d13a5eee29c7..2a44e5c0a3bebf16a35b2013cda433d97c3f7a21 100644 (file)
--- a/arch/um/Kconfig.i386
+++ b/arch/um/Kconfig.i386
@@ -42,6 +42,3 @@ config ARCH_REUSE_HOST_VSYSCALL_AREA
 config GENERIC_HWEIGHT
        bool
        default y
-
-config ARCH_SUPPORTS_AOUT
-       def_bool y

diff --git a/arch/um/Kconfig.x86_64 b/arch/um/Kconfig.x86_64
index 5696e7b374b31904b7559d045b7235b4e25bcf3e..40b3407cfe169c9b5d68aef83f06b75a382f85c0 100644 (file)
--- a/arch/um/Kconfig.x86_64
+++ b/arch/um/Kconfig.x86_64
@@ -37,6 +37,3 @@ config SMP_BROKEN
 config GENERIC_HWEIGHT
        bool
        default y
-
-config ARCH_SUPPORTS_AOUT
-       def_bool y

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ed92864d1325c09092f3e8ed4918f26341f23161..2e8fa40b3cdfd5e7a60a3bda3823405f4d5615eb 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -151,9 +151,6 @@ config AUDIT_ARCH
        bool
        default X86_64
 
-config ARCH_SUPPORTS_AOUT
-       def_bool y
-
 config ARCH_SUPPORTS_OPTIMIZED_INLINING
        def_bool y
 
@@ -1759,7 +1756,7 @@ config IA32_EMULATION
 
 config IA32_AOUT
        tristate "IA32 a.out support"
-       depends on IA32_EMULATION && ARCH_SUPPORTS_AOUT
+       depends on IA32_EMULATION
        help
          Support old a.out binaries in the 32bit emulation.
 

diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index 4a551af6f3fc956ffc4032e4c79d16c3b61294df..e4df913025df7c8f701c2a7cce7b79e413db799e 100644 (file)
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -61,8 +61,7 @@ config BINFMT_SHARED_FLAT
 
 config BINFMT_AOUT
        tristate "Kernel support for a.out and ECOFF binaries"
-       depends on ARCH_SUPPORTS_AOUT && \
-               (X86_32 || ALPHA || ARM || M68K)
+       depends on (X86_32 || ALPHA || ARM || M68K)
        ---help---
          A.out (Assembler.OUTput) is a set of formats for libraries and
          executables used in the earliest versions of UNIX.  Linux used