[XFS] Fix up an internal sort function name collision issue.

[safe/jmp/linux-2.6] / arch / ppc64 / Kconfig

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 963f519..42677cc 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -197,6 +197,9 @@ config BOOTX_TEXT
 config POWER4
        def_bool y
 
+config PPC_FPU
+       def_bool y
+
 config POWER4_ONLY
        bool "Optimize for POWER4"
        default n
@@ -245,6 +248,10 @@ config HMT
          This option enables hardware multithreading on RS64 cpus.
          pSeries systems p620 and p660 have such a cpu type.
 
+config NUMA
+       bool "NUMA support"
+       default y if SMP && PPC_PSERIES
+
 config ARCH_SELECT_MEMORY_MODEL
        def_bool y
 
@@ -260,9 +267,6 @@ config ARCH_DISCONTIGMEM_DEFAULT
        def_bool y
        depends on ARCH_DISCONTIGMEM_ENABLE
 
-config ARCH_FLATMEM_ENABLE
-       def_bool y
-
 config ARCH_SPARSEMEM_ENABLE
        def_bool y
        depends on ARCH_DISCONTIGMEM_ENABLE
@@ -285,10 +289,6 @@ config NODES_SPAN_OTHER_NODES
        def_bool y
        depends on NEED_MULTIPLE_NODES
 
-config NUMA
-       bool "NUMA support"
-       default y if DISCONTIGMEM || SPARSEMEM
-
 config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
        depends on SMP
@@ -318,6 +318,11 @@ config PPC_RTAS
        depends on PPC_PSERIES || PPC_BPA
        default y
 
+config RTAS_ERROR_LOGGING
+       bool
+       depends on PPC_RTAS
+       default y
+
 config RTAS_PROC
        bool "Proc interface to RTAS"
        depends on PPC_RTAS