lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
David S. Miller
2009-01-08 11:05:59 -08:00
parent b8c31da641 9e42d0cf50
commit 7f46b1343f
2400 changed files with 559700 additions and 49298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/misc/sgi-xp/xp_main.c
View File

@@ -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
};

8
drivers/misc/sgi-xp/xpc_main.c
View File

@@ -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()) {
/*

2
drivers/misc/sgi-xp/xpnet.c
View File

@@ -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
};