diff --git a/[refs] b/[refs]
index 16b8eab13230..0c51ce05adef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9de33df41f712712ccd3297c898e365b50fb91ef
+refs/heads/master: d7792065590ab1fd0a9f06ffaab3dc237a30b339
diff --git a/trunk/arch/mips/sni/eisa.c b/trunk/arch/mips/sni/eisa.c
index 7396cd719900..6827feb4de96 100644
--- a/trunk/arch/mips/sni/eisa.c
+++ b/trunk/arch/mips/sni/eisa.c
@@ -38,7 +38,7 @@ int __init sni_eisa_root_init(void)
 	if (!r)
 		return r;
 
-	eisa_root_dev.dev.driver_data = &eisa_bus_root;
+	dev_set_drvdata(&eisa_root_dev.dev, &eisa_bus_root);
 
 	if (eisa_root_register(&eisa_bus_root)) {
 		/* A real bridge may have been registered before