---

yaml --- r: 81414 b: refs/heads/master c: 77b4159 h: refs/heads/master v: v3
git-mirror · Jan 28, 2008 · 5ee4e73 · 5ee4e73
1 parent 8d2624a
commit 5ee4e73
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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