Merge commit 'v2.6.35-rc6' into devicetree/next

[net-next-2.6.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 2031a2846865e51bb3889742fe3fc60125532a4c..5bf34019bd667bbb28c4fa1bc6966c34df5cbb87 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/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
@@ -172,10 +174,6 @@ config ARCH_MAY_HAVE_PC_FDC
 config PPC_OF
        def_bool y
 
-config OF
-       def_bool y
-       select OF_FLATTREE
-
 config PPC_UDBG_16550
        bool
        default n
@@ -198,10 +196,6 @@ config SYS_SUPPORTS_APM_EMULATION
        default y if PMAC_APM_EMU
        bool
 
-config DTC
-       bool
-       default y
-
 config DEFAULT_UIMAGE
        bool
        help
@@ -578,14 +572,6 @@ config SCHED_SMT
          when dealing with POWER5 cpus at a cost of slightly increased
          overhead in some places. If unsure say N here.
 
-config PROC_DEVICETREE
-       bool "Support for device tree in /proc"
-       depends on PROC_FS
-       help
-         This option adds a device-tree directory under /proc which contains
-         an image of the device tree that the kernel copies from Open
-         Firmware or other boot firmware. If unsure, say Y here.
-
 config CMDLINE_BOOL
        bool "Default bootloader kernel arguments"