From 2f7c74348bfdd1fe5c5c3f25979a150328fd6d13 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Sun, 24 Jun 2012 18:24:44 +0000 Subject: [PATCH] --- yaml --- r: 313675 b: refs/heads/master c: 44b372d8a099a7042f9f17ebd4941050e38c1773 h: refs/heads/master i: 313673: dbd66643bd92c7c727cd44b2223807a0bb9bf835 313671: 6dda1acb70ad76a9539f45ac3f0f6cd685774937 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/vio.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1f5e91bd0e2c..150c93e91396 100644 --- 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 index 7d05fe2b5637..3bb5be5da31c 100644 --- 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)