Merge branch 'reiserfs-updates' from Jeff Mahoney

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / rapidio / rio-driver.c

diff --git a/drivers/rapidio/rio-driver.c b/drivers/rapidio/rio-driver.c
index addb87cf44d9954ecebe90687409dcf0c9aecb77..3222fa3c808ca4c96eeb3fc436122f041a84eebc 100644 (file)
--- a/drivers/rapidio/rio-driver.c
+++ b/drivers/rapidio/rio-driver.c
@@ -193,7 +193,7 @@ static int rio_match_bus(struct device *dev, struct device_driver *drv)
 }
 
 static struct device rio_bus = {
-       .bus_id = "rapidio",
+       .init_name = "rapidio",
 };
 
 struct bus_type rio_bus_type = {