aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/celleb/setup.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2008-01-03 06:14:36 +1100
committerPaul Mackerras <paulus@samba.org>2008-01-17 14:57:15 +1100
commite25c47ffa97ca5e4602593b03ce6d21cff652864 (patch)
tree1bbd57e332fde97d5c801d881aee57aada56113e /arch/powerpc/platforms/celleb/setup.c
parent[POWERPC] powermac: Use machine_*_initcall() hooks in platform code (diff)
downloadlinux-dev-e25c47ffa97ca5e4602593b03ce6d21cff652864.tar.xz
linux-dev-e25c47ffa97ca5e4602593b03ce6d21cff652864.zip
[POWERPC] cell: Use machine_*_initcall() hooks in platform code
Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to '')
-rw-r--r--arch/powerpc/platforms/celleb/setup.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/celleb/setup.c b/arch/powerpc/platforms/celleb/setup.c
index 0f0c4680bf01..f27ae1e3fb58 100644
--- a/arch/powerpc/platforms/celleb/setup.c
+++ b/arch/powerpc/platforms/celleb/setup.c
@@ -111,10 +111,6 @@ static struct of_device_id celleb_bus_ids[] __initdata = {
static int __init celleb_publish_devices(void)
{
- if (!machine_is(celleb_beat) &&
- !machine_is(celleb_native))
- return -ENODEV;
-
/* Publish OF platform devices for southbridge IOs */
of_platform_bus_probe(NULL, celleb_bus_ids, NULL);
@@ -122,7 +118,8 @@ static int __init celleb_publish_devices(void)
return 0;
}
-device_initcall(celleb_publish_devices);
+machine_device_initcall(celleb_beat, celleb_publish_devices);
+machine_device_initcall(celleb_native, celleb_publish_devices);
/*