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

3 files changed, 6 insertions, 6 deletions

diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
index 9a2e77172d94..16f8dcab2da4 100644
--- a/drivers/misc/sgi-xp/xp_main.c
+++ b/drivers/misc/sgi-xp/xp_main.c
@@ -25,7 +25,7 @@ struct device_driver xp_dbg_name = {
 };
 
 struct device xp_dbg_subname = {
-        .bus_id = {0},          /* set to "" */
+        .init_name = "",                /* set to "" */
         .driver = &xp_dbg_name
 };
 
diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
index e8d5cfbd32c2..89218f7cfaa7 100644
--- a/drivers/misc/sgi-xp/xpc_main.c
+++ b/drivers/misc/sgi-xp/xpc_main.c
@@ -59,12 +59,12 @@ struct device_driver xpc_dbg_name = {
 };
 
 struct device xpc_part_dbg_subname = {
-        .bus_id = {0},          /* set to "part" at xpc_init() time */
+        .init_name = "",        /* set to "part" at xpc_init() time */
         .driver = &xpc_dbg_name
 };
 
 struct device xpc_chan_dbg_subname = {
-        .bus_id = {0},          /* set to "chan" at xpc_init() time */
+        .init_name = "",        /* set to "chan" at xpc_init() time */
         .driver = &xpc_dbg_name
 };
 
@@ -1258,8 +1258,8 @@ xpc_init(void)
         int ret;
         struct task_struct *kthread;
 
-        snprintf(xpc_part->bus_id, BUS_ID_SIZE, "part");
-        snprintf(xpc_chan->bus_id, BUS_ID_SIZE, "chan");
+        dev_set_name(xpc_part, "part");
+        dev_set_name(xpc_chan, "chan");
 
         if (is_shub()) {
                 /*
diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c
index e5f0a947c083..7957f525b2f4 100644
--- 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
 };