Merge branch 'kmemtrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / misc / sgi-xp / xp_main.c

diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
index 9a2e77172d942f548402e9ce8ccce25d9e3bf935..16f8dcab2da4ba9c63342ed7766a6c741da2b020 100644 (file)
--- 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
 };