From 585973e3e6212ceff2ef4af2abfb9197d80c9375 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 23 Feb 2011 10:05:53 +0100 Subject: [PATCH] --- yaml --- r: 234915 b: refs/heads/master c: fe239545a1eed57a60c5d4063f0b56f6cd1811ff h: refs/heads/master i: 234913: 1c9abf58b6fe2b4e91ea12055ad7ff8fd3c5c690 234911: 72ea904077acc733c0abac6f546f451870dcd110 v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 841e31d13532..4055fb8198a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 540089798d2ae115fc9bff7ed3823c8c32249607 +refs/heads/master: fe239545a1eed57a60c5d4063f0b56f6cd1811ff diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index e327f96b8805..dbc10fce6665 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -2080,18 +2080,12 @@ config OLPC_XO1 Add support for non-essential features of the OLPC XO-1 laptop. config OLPC_OPENFIRMWARE - bool "Support for OLPC's Open Firmware" - depends on !X86_PAE - default n + bool select OF - help - This option adds support for the implementation of Open Firmware - that is used on the OLPC XO-1 Children's Machine. - If unsure, say N here. + select OLPC_OPENFIRMWARE_DT if PROC_DEVICETREE config OLPC_OPENFIRMWARE_DT bool - default y if OLPC_OPENFIRMWARE && PROC_DEVICETREE select OF_PROMTREE endif # X86_32