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

2009-01-08 11:05:59 -08:00
parent b8c31da641 9e42d0cf50
commit 7f46b1343f
2400 changed files with 559700 additions and 49298 deletions
--- 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
 };