From 1f69449038a4db07b276151b4db29bf66d1b855f Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Mon, 21 Jan 2008 11:58:06 -0700 Subject: [PATCH] --- yaml --- r: 81313 b: refs/heads/master c: 6869e4ad4bd17e7699e58bed6464738e8677c392 h: refs/heads/master i: 81311: c99cde52aabdb25922d1e38c8040f97c501365e6 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/8xx/ep88xc.c | 5 ++--- trunk/arch/powerpc/platforms/8xx/mpc86xads_setup.c | 5 ++--- trunk/arch/powerpc/platforms/8xx/mpc885ads_setup.c | 5 ++--- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index d1cc0d81cf9e..54d803466b91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1dd4561e7d9b907afd10709f9ff092861e8ab095 +refs/heads/master: 6869e4ad4bd17e7699e58bed6464738e8677c392 diff --git a/trunk/arch/powerpc/platforms/8xx/ep88xc.c b/trunk/arch/powerpc/platforms/8xx/ep88xc.c index c518b6cc5fab..88afa353f1d2 100644 --- a/trunk/arch/powerpc/platforms/8xx/ep88xc.c +++ b/trunk/arch/powerpc/platforms/8xx/ep88xc.c @@ -155,12 +155,11 @@ static struct of_device_id __initdata of_bus_ids[] = { static int __init declare_of_platform_devices(void) { /* Publish the QE devices */ - if (machine_is(ep88xc)) - of_platform_bus_probe(NULL, of_bus_ids, NULL); + of_platform_bus_probe(NULL, of_bus_ids, NULL); return 0; } -device_initcall(declare_of_platform_devices); +machine_device_initcall(ep88xc, declare_of_platform_devices); define_machine(ep88xc) { .name = "Embedded Planet EP88xC", diff --git a/trunk/arch/powerpc/platforms/8xx/mpc86xads_setup.c b/trunk/arch/powerpc/platforms/8xx/mpc86xads_setup.c index d2927a434aef..d7965f885209 100644 --- a/trunk/arch/powerpc/platforms/8xx/mpc86xads_setup.c +++ b/trunk/arch/powerpc/platforms/8xx/mpc86xads_setup.c @@ -128,12 +128,11 @@ static struct of_device_id __initdata of_bus_ids[] = { static int __init declare_of_platform_devices(void) { - if (machine_is(mpc86x_ads)) - of_platform_bus_probe(NULL, of_bus_ids, NULL); + of_platform_bus_probe(NULL, of_bus_ids, NULL); return 0; } -device_initcall(declare_of_platform_devices); +machine_device_initcall(mpc86x_ads, declare_of_platform_devices); define_machine(mpc86x_ads) { .name = "MPC86x ADS", diff --git a/trunk/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/trunk/arch/powerpc/platforms/8xx/mpc885ads_setup.c index 2cf1b6a75173..6ef8e9e6b8c3 100644 --- a/trunk/arch/powerpc/platforms/8xx/mpc885ads_setup.c +++ b/trunk/arch/powerpc/platforms/8xx/mpc885ads_setup.c @@ -264,12 +264,11 @@ static struct of_device_id __initdata of_bus_ids[] = { static int __init declare_of_platform_devices(void) { /* Publish the QE devices */ - if (machine_is(mpc885_ads)) - of_platform_bus_probe(NULL, of_bus_ids, NULL); + of_platform_bus_probe(NULL, of_bus_ids, NULL); return 0; } -device_initcall(declare_of_platform_devices); +machine_device_initcall(mpc885_ads, declare_of_platform_devices); define_machine(mpc885_ads) { .name = "Freescale MPC885 ADS",