Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge

[powerpc.git] / arch / ppc64 / Kconfig

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 13b262f..b987164 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -10,6 +10,9 @@ config MMU
        bool
        default y
 
+config PPC_STD_MMU
+       def_bool y
+
 config UID16
        bool
 
@@ -28,10 +31,6 @@ config GENERIC_ISA_DMA
        bool
        default y
 
-config HAVE_DEC_LOCK
-       bool
-       default y
-
 config EARLY_PRINTK
        bool
        default y
@@ -44,6 +43,10 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
        bool
        default y
 
+config ARCH_MAY_HAVE_PC_FDC
+       bool
+       default y
+
 # We optimistically allocate largepages from the VM, so make the limit
 # large enough (16MB). This badly named config option is actually
 # max order + 1
@@ -86,12 +89,14 @@ config PPC_PMAC
        bool "  Apple G5 based machines"
        default y
        select U3_DART
+       select GENERIC_TBSYNC
 
 config PPC_MAPLE
        depends on PPC_MULTIPLATFORM
        bool "  Maple 970FX Evaluation Board"
        select U3_DART
        select MPIC_BROKEN_U3
+       select GENERIC_TBSYNC
        default n
        help
           This option enables support for the Maple 970FX Evaluation Board.
@@ -120,6 +125,11 @@ config MPIC
        bool
        default y
 
+config PPC_I8259
+       depends on PPC_PSERIES
+       bool
+       default y
+
 config BPA_IIC
        depends on PPC_BPA
        bool
@@ -174,6 +184,9 @@ config MPIC_BROKEN_U3
        depends on PPC_MAPLE
        default y
 
+config GENERIC_TBSYNC
+       def_bool n
+
 config PPC_PMAC64
        bool
        depends on PPC_PMAC
@@ -186,6 +199,12 @@ config BOOTX_TEXT
          Say Y here to see progress messages from the boot firmware in text
          mode. Requires an Open Firmware compatible video card.
 
+config POWER4
+       def_bool y
+
+config PPC_FPU
+       def_bool y
+
 config POWER4_ONLY
        bool "Optimize for POWER4"
        default n
@@ -234,6 +253,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
 
@@ -249,9 +272,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
@@ -274,10 +294,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
@@ -307,6 +323,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
@@ -357,7 +378,6 @@ config HOTPLUG_CPU
 
 config PROC_DEVICETREE
        bool "Support for Open Firmware device tree in /proc"
-       depends on !PPC_ISERIES
        help
          This option adds a device-tree directory under /proc which contains
          an image of the device tree that the kernel copies from Open
@@ -461,7 +481,7 @@ config VIOPATH
        depends on VIOCONS || VIODASD || VIOCD || VIOTAPE || VETH
        default y
 
-source "arch/ppc64/oprofile/Kconfig"
+source "arch/powerpc/oprofile/Kconfig"
 
 source "arch/ppc64/Kconfig.debug"