From 37f57a57aa403bce5f024d74ce5918d84ed0458f Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 18 Jun 2009 23:28:34 -0500 Subject: [PATCH] --- yaml --- r: 154411 b: refs/heads/master c: a44a23ed4d144e4fb83d256b32021b732bda4787 h: refs/heads/master i: 154409: ba0a574a8c7628ac9136fa846c5c308327a1f62d 154407: 7a58dcf5196f4db13ec537011b87eef601172ff9 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/85xx/socrates.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2e9ee8562e8b..ab3cfac15128 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e10cf587a7b1aa34099cbfc244e6f04e96dc835 +refs/heads/master: a44a23ed4d144e4fb83d256b32021b732bda4787 diff --git a/trunk/arch/powerpc/platforms/85xx/socrates.c b/trunk/arch/powerpc/platforms/85xx/socrates.c index d0e8443b12c6..747d8fb3ab82 100644 --- a/trunk/arch/powerpc/platforms/85xx/socrates.c +++ b/trunk/arch/powerpc/platforms/85xx/socrates.c @@ -102,10 +102,11 @@ static struct of_device_id __initdata socrates_of_bus_ids[] = { {}, }; -static void __init socrates_init(void) +static int __init socrates_publish_devices(void) { - of_platform_bus_probe(NULL, socrates_of_bus_ids, NULL); + return of_platform_bus_probe(NULL, socrates_of_bus_ids, NULL); } +machine_device_initcall(socrates, socrates_publish_devices); /* * Called very early, device-tree isn't unflattened @@ -124,7 +125,6 @@ define_machine(socrates) { .name = "Socrates", .probe = socrates_probe, .setup_arch = socrates_setup_arch, - .init = socrates_init, .init_IRQ = socrates_pic_init, .get_irq = mpic_get_irq, .restart = fsl_rstcr_restart,