Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[linux-2.6-block.git] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index cd28b6cd95a26883f7f668fde1771aa284ea764d..6bf594ace663ec82f746132b4f62fc351bf5160c 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -44,7 +44,6 @@ config SPARC
        select ARCH_HAS_SG_CHAIN
        select CPU_NO_EFFICIENT_FFS
        select LOCKDEP_SMALL if LOCKDEP
-       select ARCH_WANT_RELAX_ORDER
 
 config SPARC32
        def_bool !64BIT
@@ -99,9 +98,6 @@ config ARCH_PROC_KCORE_TEXT
 config CPU_BIG_ENDIAN
        def_bool y
 
-config CPU_BIG_ENDIAN
-       def_bool y
-
 config ARCH_ATU
        bool
        default y if SPARC64