Merge commit 'v2.6.34-rc1' into for-linus

[~andy/linux] / drivers / of / Kconfig

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index d2fa27c5c1b28e444748214e363bb3c462a43f0e..7cecc8fea9bd799ffd37e7361c7636cbe3bd69f1 100644 (file)
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -1,3 +1,11 @@
+config OF_FLATTREE
+       bool
+       depends on OF
+
+config OF_DYNAMIC
+       def_bool y
+       depends on OF && PPC_OF
+
 config OF_DEVICE
        def_bool y
        depends on OF && (SPARC || PPC_OF || MICROBLAZE)