summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2010-06-28 22:00:48 -0400
committerGrant Likely <grant.likely@secretlab.ca>2010-07-05 16:46:43 -0600
commitef2a4524d6e776bbce819eeccbdcaeee5ce74027 (patch)
tree649f1327091e544e70b08b5f83f6dd9e7f4da340
parent5ab5fc7e35705cf1a8a506d8e8b71acc27feec75 (diff)
downloadblackbird-obmc-linux-ef2a4524d6e776bbce819eeccbdcaeee5ce74027.tar.gz
blackbird-obmc-linux-ef2a4524d6e776bbce819eeccbdcaeee5ce74027.zip
proc: unify PROC_DEVICETREE config
Microblaze and PPC both use PROC_DEVICETREE, and OLPC will as well.. put the Kconfig option into fs/ rather than in arch/*/Kconfig. Signed-off-by: Andres Salomon <dilinger@queued.net> [grant.likely@secretlab.ca: changed depends to PROC_FS && !SPARC] [grant.likely@secretlab.ca: moved to drivers/of/Kconfig] Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r--arch/microblaze/Kconfig8
-rw-r--r--arch/powerpc/Kconfig8
-rw-r--r--drivers/of/Kconfig8
3 files changed, 8 insertions, 16 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 971f86760d83..6c4fee5eaf0b 100644
--- a/arch/microblaze/Kconfig
+++ b/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/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 9b8e479c39da..c9ae321a06f9 100644
--- a/arch/powerpc/Kconfig
+++ b/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/drivers/of/Kconfig b/drivers/of/Kconfig
index ae2d4ad67bd0..6acbff389ab6 100644
--- a/drivers/of/Kconfig
+++ b/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
OpenPOWER on IntegriCloud