aboutsummaryrefslogtreecommitdiffstats
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 18:46:43 -0400
commitef2a4524d6e776bbce819eeccbdcaeee5ce74027 (patch)
tree649f1327091e544e70b08b5f83f6dd9e7f4da340
parent5ab5fc7e35705cf1a8a506d8e8b71acc27feec75 (diff)
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
123 Set this to have arguments from the default kernel command string 123 Set this to have arguments from the default kernel command string
124 override those passed by the boot loader. 124 override those passed by the boot loader.
125 125
126config PROC_DEVICETREE
127 bool "Support for device tree in /proc"
128 depends on PROC_FS
129 help
130 This option adds a device-tree directory under /proc which contains
131 an image of the device tree that the kernel copies from Open
132 Firmware or other boot firmware. If unsure, say Y here.
133
134endmenu 126endmenu
135 127
136menu "Advanced setup" 128menu "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
572 when dealing with POWER5 cpus at a cost of slightly increased 572 when dealing with POWER5 cpus at a cost of slightly increased
573 overhead in some places. If unsure say N here. 573 overhead in some places. If unsure say N here.
574 574
575config PROC_DEVICETREE
576 bool "Support for device tree in /proc"
577 depends on PROC_FS
578 help
579 This option adds a device-tree directory under /proc which contains
580 an image of the device tree that the kernel copies from Open
581 Firmware or other boot firmware. If unsure, say Y here.
582
583config CMDLINE_BOOL 575config CMDLINE_BOOL
584 bool "Default bootloader kernel arguments" 576 bool "Default bootloader kernel arguments"
585 577
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
7menu "Flattened Device Tree and Open Firmware support" 7menu "Flattened Device Tree and Open Firmware support"
8 depends on OF 8 depends on OF
9 9
10config PROC_DEVICETREE
11 bool "Support for device tree in /proc"
12 depends on PROC_FS && !SPARC
13 help
14 This option adds a device-tree directory under /proc which contains
15 an image of the device tree that the kernel copies from Open
16 Firmware or other boot firmware. If unsure, say Y here.
17
10config OF_FLATTREE 18config OF_FLATTREE
11 bool 19 bool
12 select DTC 20 select DTC