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()

Changed files
-18
arch
x86
platform
olpc
-18
arch/x86/platform/olpc/olpc_dt.c
··· 19 19 #include <linux/kernel.h> 20 20 #include <linux/memblock.h> 21 21 #include <linux/of.h> 22 - #include <linux/of_platform.h> 23 22 #include <linux/of_pdt.h> 24 23 #include <asm/olpc.h> 25 24 #include <asm/olpc_ofw.h> ··· 284 285 pr_info("PROM DT: Built device tree with %u bytes of memory.\n", 285 286 prom_early_allocated); 286 287 } 287 - 288 - /* A list of DT node/bus matches that we want to expose as platform devices */ 289 - static struct of_device_id __initdata of_ids[] = { 290 - { .compatible = "olpc,xo1-battery" }, 291 - { .compatible = "olpc,xo1-dcon" }, 292 - { .compatible = "olpc,xo1-rtc" }, 293 - {}, 294 - }; 295 - 296 - static int __init olpc_create_platform_devices(void) 297 - { 298 - if (machine_is_olpc()) 299 - return of_platform_bus_probe(NULL, of_ids, NULL); 300 - else 301 - return 0; 302 - } 303 - device_initcall(olpc_create_platform_devices);