Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build

Manual fixup of:

	arch/powerpc/Kconfig

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 06b72771ae22..1530a41fc56d 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -108,12 +108,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 HAVE_DMA_ATTRS if PPC64
+        select HAVE_OPROFILE
 
 config EARLY_PRINTK
         bool