Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc2fd5f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 platform update from Ingo Molnar:
 "An OLPC platform support simplification patch"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/olpc: Do not call of_platform_bus_probe()
parents e57d9f63 c04e5538

arch/x86/platform/olpc/olpc_dt.c

+0 −18
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/kernel.h>

#include <linux/memblock.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/of_pdt.h>

#include <asm/olpc.h>

#include <asm/olpc_ofw.h>
@@ -285,20 +284,3 @@ void __init olpc_dt_build_devicetree(void) 
	pr_info("PROM DT: Built device tree with %u bytes of memory.\n",

			prom_early_allocated);

}
 


/* A list of DT node/bus matches that we want to expose as platform devices */

static struct of_device_id __initdata of_ids[] = {

	{ .compatible = "olpc,xo1-battery" },

	{ .compatible = "olpc,xo1-dcon" },

	{ .compatible = "olpc,xo1-rtc" },

	{},

};



static int __init olpc_create_platform_devices(void)

{

	if (machine_is_olpc())

		return of_platform_bus_probe(NULL, of_ids, NULL);

	else

		return 0;

}

device_initcall(olpc_create_platform_devices);