---

yaml --- r: 313675 b: refs/heads/master c: 44b372d h: refs/heads/master i: 313673: dbd6664 313671: 6dda1ac v: v3
git-mirror · Jul 10, 2012 · 2f7c743 · 2f7c743
1 parent be314f4
commit 2f7c743
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62761d1f68937b4d3dd509032942290f2359bde7
+refs/heads/master: 44b372d8a099a7042f9f17ebd4941050e38c1773
diff --git a/trunk/arch/powerpc/kernel/vio.c b/trunk/arch/powerpc/kernel/vio.c
@@ -1497,12 +1497,18 @@ static int __init vio_bus_init(void)
 	if (firmware_has_feature(FW_FEATURE_CMO))
 		vio_cmo_bus_init();
 
+	return 0;
+}
+postcore_initcall(vio_bus_init);
+
+static int __init vio_device_init(void)
+{
 	vio_bus_scan_register_devices("vdevice");
 	vio_bus_scan_register_devices("ibm,platform-facilities");
 
 	return 0;
 }
-__initcall(vio_bus_init);
+device_initcall(vio_device_init);
 
 static ssize_t name_show(struct device *dev,
 		struct device_attribute *attr, char *buf)