Merge branch 'linux-2.6' into for-2.6.24
[linux-2.6.git] / arch / powerpc / platforms / Kconfig
index 19d4628edf79213c9244130f4080d11f1f65d7e8..065f3b19d6c749ea902700601482afaed8b0f59b 100644 (file)
@@ -19,6 +19,7 @@ config EMBEDDED6xx
 config PPC_82xx
        bool "Freescale 82xx"
        depends on 6xx
+       select WANT_DEVICE_TREE
 
 config PPC_83xx
        bool "Freescale 83xx"
@@ -58,7 +59,7 @@ source "arch/powerpc/platforms/85xx/Kconfig"
 source "arch/powerpc/platforms/86xx/Kconfig"
 source "arch/powerpc/platforms/embedded6xx/Kconfig"
 source "arch/powerpc/platforms/44x/Kconfig"
-#source "arch/powerpc/platforms/4xx/Kconfig
+source "arch/powerpc/platforms/40x/Kconfig"
 
 config PPC_NATIVE
        bool