Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

[linux-beck.git] / arch / microblaze / Kconfig

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index be3855250db65625f68019449db839fbbc895e76..9bd64b4b2b0c564fefd26d8d87937d8244d29e7c 100644 (file)
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -18,6 +18,8 @@ config MICROBLAZE
        select HAVE_DMA_ATTRS
        select HAVE_DMA_API_DEBUG
        select TRACING_SUPPORT
+       select OF
+       select OF_FLATTREE
 
 config SWAP
        def_bool n
@@ -76,9 +78,6 @@ config LOCKDEP_SUPPORT
 config HAVE_LATENCYTOP_SUPPORT
        def_bool y
 
-config DTC
-       def_bool y
-
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
@@ -125,18 +124,6 @@ config CMDLINE_FORCE
          Set this to have arguments from the default kernel command string
          override those passed by the boot loader.
 
-config OF
-       def_bool y
-       select OF_FLATTREE
-
-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.
-
 endmenu
 
 menu "Advanced setup"