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/message/i2o/iop.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/message/i2o/iop.c')
| -rw-r--r-- | drivers/message/i2o/iop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c index 35c67d1f255e..27cf4af0e13d 100644 --- a/drivers/message/i2o/iop.c +++ b/drivers/message/i2o/iop.c | |||
| @@ -1072,7 +1072,7 @@ struct i2o_controller *i2o_iop_alloc(void) | |||
| 1072 | 1072 | ||
| 1073 | c->device.release = &i2o_iop_release; | 1073 | c->device.release = &i2o_iop_release; |
| 1074 | 1074 | ||
| 1075 | snprintf(c->device.bus_id, BUS_ID_SIZE, "iop%d", c->unit); | 1075 | dev_set_name(&c->device, "iop%d", c->unit); |
| 1076 | 1076 | ||
| 1077 | #if BITS_PER_LONG == 64 | 1077 | #if BITS_PER_LONG == 64 |
| 1078 | spin_lock_init(&c->context_list_lock); | 1078 | spin_lock_init(&c->context_list_lock); |