From c6d4a09c6722a232f30190013a710c68aa90a220 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 4 May 2009 12:40:54 -0700
Subject: [PATCH] --- yaml --- r: 151284 b: refs/heads/master c:
 d7792065590ab1fd0a9f06ffaab3dc237a30b339 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/arch/mips/sni/eisa.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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