Merge branch 'generic-ipi' into generic-ipi-for-linus

[linux-2.6-omap-h63xx.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 852d40c29637ac199e5e539b843e60f9668b932d..20eacf2a842474ab0c4d5c3c39aadd6a85ad5ae7 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -105,12 +105,14 @@ config ARCH_NO_VIRT_TO_BUS
 config PPC
        bool
        default y
+       select HAVE_DYNAMIC_FTRACE
+       select HAVE_FTRACE
        select HAVE_IDE
-       select HAVE_OPROFILE
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select HAVE_LMB
        select USE_GENERIC_SMP_HELPERS if SMP
+       select HAVE_OPROFILE
 
 config EARLY_PRINTK
        bool