Merge commit 'origin/master' into next

[linux-2.6-block.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 654bba5cf6b4dc721e34021b150431129a039bb8..155d571f5e261c82d59f55ea2758d9accd6af15a 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -173,6 +173,7 @@ config PPC_OF
 
 config OF
        def_bool y
+       select OF_FLATTREE
 
 config PPC_UDBG_16550
        bool