Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / misc / sgi-xp / xpnet.c

diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c
index e5f0a947c0831368cc6b1c166494066675a79145..7957f525b2f45e661ce026c3ec0670dc2c420aef 100644 (file)
--- a/drivers/misc/sgi-xp/xpnet.c
+++ b/drivers/misc/sgi-xp/xpnet.c
@@ -133,7 +133,7 @@ struct device_driver xpnet_dbg_name = {
 };
 
 struct device xpnet_dbg_subname = {
-       .bus_id = {0},          /* set to "" */
+       .init_name = "",        /* set to "" */
        .driver = &xpnet_dbg_name
 };