diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/char/viotape.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/char/viotape.c')
| -rw-r--r-- | drivers/char/viotape.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c index d92a05645007..51abd3defc1c 100644 --- a/drivers/char/viotape.c +++ b/drivers/char/viotape.c | |||
| @@ -956,9 +956,9 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id) | |||
| 956 | state[i].cur_part = 0; | 956 | state[i].cur_part = 0; |
| 957 | for (j = 0; j < MAX_PARTITIONS; ++j) | 957 | for (j = 0; j < MAX_PARTITIONS; ++j) |
| 958 | state[i].part_stat_rwi[j] = VIOT_IDLE; | 958 | state[i].part_stat_rwi[j] = VIOT_IDLE; |
| 959 | class_device_create(tape_class, MKDEV(VIOTAPE_MAJOR, i), NULL, | 959 | class_device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i), NULL, |
| 960 | "iseries!vt%d", i); | 960 | "iseries!vt%d", i); |
| 961 | class_device_create(tape_class, MKDEV(VIOTAPE_MAJOR, i | 0x80), | 961 | class_device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80), |
| 962 | NULL, "iseries!nvt%d", i); | 962 | NULL, "iseries!nvt%d", i); |
| 963 | devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i), S_IFCHR | S_IRUSR | S_IWUSR, | 963 | devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i), S_IFCHR | S_IRUSR | S_IWUSR, |
| 964 | "iseries/vt%d", i); | 964 | "iseries/vt%d", i); |