diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 13:10:23 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 13:10:23 -0400 |
| commit | a4e0d9af403d099e751797f6cc69e4a8e2d78ef1 (patch) | |
| tree | 6f4afdffe5dbaad7529be987b8c3259a07395031 /drivers/char/viotape.c | |
| parent | c60f2b5c1defb6b1345968e1c65c2008c221d57d (diff) | |
| parent | c010b2f76c3032e48097a6eef291d8593d5d79a6 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/char/viotape.c')
| -rw-r--r-- | drivers/char/viotape.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c index e5da98d8f9cd..7a70a40ad639 100644 --- a/drivers/char/viotape.c +++ b/drivers/char/viotape.c | |||
| @@ -886,10 +886,10 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id) | |||
| 886 | state[i].cur_part = 0; | 886 | state[i].cur_part = 0; |
| 887 | for (j = 0; j < MAX_PARTITIONS; ++j) | 887 | for (j = 0; j < MAX_PARTITIONS; ++j) |
| 888 | state[i].part_stat_rwi[j] = VIOT_IDLE; | 888 | state[i].part_stat_rwi[j] = VIOT_IDLE; |
| 889 | device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i), | 889 | device_create_drvdata(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i), |
| 890 | "iseries!vt%d", i); | 890 | NULL, "iseries!vt%d", i); |
| 891 | device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80), | 891 | device_create_drvdata(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80), |
| 892 | "iseries!nvt%d", i); | 892 | NULL, "iseries!nvt%d", i); |
| 893 | printk(VIOTAPE_KERN_INFO "tape iseries/vt%d is iSeries " | 893 | printk(VIOTAPE_KERN_INFO "tape iseries/vt%d is iSeries " |
| 894 | "resource %10.10s type %4.4s, model %3.3s\n", | 894 | "resource %10.10s type %4.4s, model %3.3s\n", |
| 895 | i, viotape_unitinfo[i].rsrcname, | 895 | i, viotape_unitinfo[i].rsrcname, |