diff --git a/[refs] b/[refs] index 4e43d160135f..c4743dcce821 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae5bf63f2d8bad78e427e77f3f896e81cbdbde0d +refs/heads/master: 10f85f43ef134014da72d2bcc1bff1abb9b0640c diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index 328774bd41ee..369723183002 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/arch/powerpc/Kconfig @@ -120,6 +120,8 @@ config ARCH_NO_VIRT_TO_BUS config PPC bool default y + select OF + select OF_FLATTREE select HAVE_FTRACE_MCOUNT_RECORD select HAVE_DYNAMIC_FTRACE select HAVE_FUNCTION_TRACER @@ -173,8 +175,7 @@ config PPC_OF def_bool y config OF - def_bool y - select OF_FLATTREE + bool config PPC_UDBG_16550 bool