From 5ee4e733e57d883662974d47bd6efa7821ddd184 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 28 Jan 2008 10:55:42 -0600 Subject: [PATCH] --- yaml --- r: 81414 b: refs/heads/master c: 77b41597e8d469535cfe09a641654bdc97dcf0d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/85xx/sbc8548.c | 6 ++---- trunk/arch/powerpc/platforms/85xx/sbc8560.c | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index a33545d2f861..dfbf2b926fd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b38308ac8e0404eea82fec09d560a2bc29a514f4 +refs/heads/master: 77b41597e8d469535cfe09a641654bdc97dcf0d0 diff --git a/trunk/arch/powerpc/platforms/85xx/sbc8548.c b/trunk/arch/powerpc/platforms/85xx/sbc8548.c index de27b576c13d..488facb99fe8 100644 --- a/trunk/arch/powerpc/platforms/85xx/sbc8548.c +++ b/trunk/arch/powerpc/platforms/85xx/sbc8548.c @@ -135,13 +135,11 @@ static struct of_device_id __initdata of_bus_ids[] = { static int __init declare_of_platform_devices(void) { - if (!machine_is(sbc8548)) - return 0; - of_platform_bus_probe(NULL, of_bus_ids, NULL); + return 0; } -device_initcall(declare_of_platform_devices); +machine_device_initcall(sbc8548, declare_of_platform_devices); /* * Called very early, device-tree isn't unflattened diff --git a/trunk/arch/powerpc/platforms/85xx/sbc8560.c b/trunk/arch/powerpc/platforms/85xx/sbc8560.c index e2bc368b38d9..2c580cd24e4f 100644 --- a/trunk/arch/powerpc/platforms/85xx/sbc8560.c +++ b/trunk/arch/powerpc/platforms/85xx/sbc8560.c @@ -222,13 +222,11 @@ static struct of_device_id __initdata of_bus_ids[] = { static int __init declare_of_platform_devices(void) { - if (!machine_is(sbc8560)) - return 0; - of_platform_bus_probe(NULL, of_bus_ids, NULL); + return 0; } -device_initcall(declare_of_platform_devices); +machine_device_initcall(sbc8560, declare_of_platform_devices); /* * Called very early, device-tree isn't unflattened