From 55e2338f9f795e7cbfca084b9a04456b741b96f5 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Mon, 28 Jun 2010 22:00:48 -0400 Subject: [PATCH] --- yaml --- r: 204919 b: refs/heads/master c: ef2a4524d6e776bbce819eeccbdcaeee5ce74027 h: refs/heads/master i: 204917: a9117a9cb87d38e49f681ba536cbd8bd2565d7de 204915: b206eec070514ca66e4f39113b152b9ffd402790 204911: 2f9da15e89532733d38f4b03369e257af820b79c v: v3 --- [refs] | 2 +- trunk/arch/microblaze/Kconfig | 8 -------- trunk/arch/powerpc/Kconfig | 8 -------- trunk/drivers/of/Kconfig | 8 ++++++++ 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 1260aed4b8e9..c49579277b19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ab5fc7e35705cf1a8a506d8e8b71acc27feec75 +refs/heads/master: ef2a4524d6e776bbce819eeccbdcaeee5ce74027 diff --git a/trunk/arch/microblaze/Kconfig b/trunk/arch/microblaze/Kconfig index 971f86760d83..6c4fee5eaf0b 100644 --- a/trunk/arch/microblaze/Kconfig +++ b/trunk/arch/microblaze/Kconfig @@ -123,14 +123,6 @@ config CMDLINE_FORCE Set this to have arguments from the default kernel command string override those passed by the boot loader. -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" diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index 9b8e479c39da..c9ae321a06f9 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/arch/powerpc/Kconfig @@ -572,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" diff --git a/trunk/drivers/of/Kconfig b/trunk/drivers/of/Kconfig index ae2d4ad67bd0..6acbff389ab6 100644 --- a/trunk/drivers/of/Kconfig +++ b/trunk/drivers/of/Kconfig @@ -7,6 +7,14 @@ config OF menu "Flattened Device Tree and Open Firmware support" depends on OF +config PROC_DEVICETREE + bool "Support for device tree in /proc" + depends on PROC_FS && !SPARC + 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 OF_FLATTREE bool select DTC