Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-microblaze.git] / arch / ppc64 / Kconfig

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index f5508ab..5cb3438 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -40,6 +40,10 @@ config COMPAT
        bool
        default y
 
+config SCHED_NO_NO_OMIT_FRAME_POINTER
+       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
@@ -258,6 +262,7 @@ config PPC_RTAS
 config RTAS_PROC
        bool "Proc interface to RTAS"
        depends on PPC_RTAS
+       default y
 
 config RTAS_FLASH
        tristate "Firmware flash interface"