diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /drivers/misc/sgi-xp/xpnet.c | |
| parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/misc/sgi-xp/xpnet.c')
| -rw-r--r-- | drivers/misc/sgi-xp/xpnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 = { | |||
| 133 | }; | 133 | }; |
| 134 | 134 | ||
| 135 | struct device xpnet_dbg_subname = { | 135 | struct device xpnet_dbg_subname = { |
| 136 | .bus_id = {0}, /* set to "" */ | 136 | .init_name = "", /* set to "" */ |
| 137 | .driver = &xpnet_dbg_name | 137 | .driver = &xpnet_dbg_name |
| 138 | }; | 138 | }; |
| 139 | 139 | ||