Merge remote branch 'kumar/merge' into merge

[cascardo/linux.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 8f4d50b..2f6a22e 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -140,6 +140,8 @@ config PPC
        select IRQ_PER_CPU
        select GENERIC_IRQ_SHOW
        select GENERIC_IRQ_SHOW_LEVEL
+       select HAVE_RCU_TABLE_FREE if SMP
+       select HAVE_SYSCALL_TRACEPOINTS
 
 config EARLY_PRINTK
        bool
@@ -193,6 +195,12 @@ config SYS_SUPPORTS_APM_EMULATION
        default y if PMAC_APM_EMU
        bool
 
+config EPAPR_BOOT
+       bool
+       help
+         Used to allow a board to specify it wants an ePAPR compliant wrapper.
+       default n
+
 config DEFAULT_UIMAGE
        bool
        help