diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-26 16:58:01 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-26 16:58:01 +1000 |
| commit | fd0cca754f3f6756bfdafe500e4f49b1b9e9723f (patch) | |
| tree | b1eb43fb2fb068ed5fc92b031e3ae853e599af9c /arch/powerpc/platforms/85xx/socrates.c | |
| parent | 5ba762c9bb3ce2cc11e9e111cb3c476e84b91668 (diff) | |
| parent | 66c6b856d8738278a4a6e558d25c90e9950aa112 (diff) | |
Merge commit 'kumar/next' into merge
Diffstat (limited to 'arch/powerpc/platforms/85xx/socrates.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/socrates.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/85xx/socrates.c b/arch/powerpc/platforms/85xx/socrates.c index d0e8443b12c..747d8fb3ab8 100644 --- a/arch/powerpc/platforms/85xx/socrates.c +++ b/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, |