---

yaml
---
r: 234917
b: refs/heads/master
c: c2a941f
h: refs/heads/master
i:
  234915: 585973e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc3119e700216a70e82fe07a79f1618852058354
+refs/heads/master: c2a941fadb57d157d59eec424674bd0c3a28788c

trunk/arch/x86/Kconfig

@@ -2069,7 +2069,7 @@ config OLPC
 	depends on !X86_PAE
 	select GPIOLIB
 	select OF
-	select OLPC_OPENFIRMWARE_DT if PROC_DEVICETREE
+	select OF_PROMTREE if PROC_DEVICETREE
 	---help---
 	  Add support for detecting the unique features of the OLPC
 	  XO hardware.
@@ -2080,10 +2080,6 @@ config OLPC_XO1
 	---help---
 	  Add support for non-essential features of the OLPC XO-1 laptop.
 
-config OLPC_OPENFIRMWARE_DT
-	bool
-	select OF_PROMTREE
-
 endif # X86_32
 
 config AMD_NB

trunk/arch/x86/include/asm/olpc_ofw.h

@@ -24,10 +24,10 @@ extern void setup_olpc_ofw_pgd(void);
 /* check if OFW was detected during boot */
 extern bool olpc_ofw_present(void);
 
-#ifdef CONFIG_OLPC_OPENFIRMWARE_DT
+#ifdef CONFIG_OF_PROMTREE
 extern void olpc_dt_build_devicetree(void);
 #else
 static inline void olpc_dt_build_devicetree(void) { }
-#endif /* CONFIG_OLPC_OPENFIRMWARE_DT */
+#endif
 
 #endif /* _ASM_X86_OLPC_OFW_H */

trunk/arch/x86/platform/olpc/Makefile

@@ -1,4 +1,4 @@
 obj-$(CONFIG_OLPC)		+= olpc.o
 obj-$(CONFIG_OLPC_XO1)		+= olpc-xo1.o
 obj-$(CONFIG_OLPC)		+= olpc_ofw.o
-obj-$(CONFIG_OLPC_OPENFIRMWARE_DT)	+= olpc_dt.o
+obj-$(CONFIG_OF_PROMTREE)	+= olpc_dt.o