Merge branch 'processor-procfs-2.6.32' into release

[mv-sheeva.git] / arch / mips / sni / eisa.c

diff --git a/arch/mips/sni/eisa.c b/arch/mips/sni/eisa.c
index 7396cd719900255c0379eda6b4d62dafe5fa8c6f..6827feb4de9671b7ef72201e55bff0abdffa6329 100644 (file)
--- a/arch/mips/sni/eisa.c
+++ b/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