diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 16:09:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 16:09:47 -0400 |
| commit | 84860bf0644d7c45afe7ddbd30731c3e3c371fae (patch) | |
| tree | d6c4b98a9c3fd9981e7fcc5d7729c9e01e327767 /drivers/s390/char/vmlogrdr.c | |
| parent | 8caf89157d64f1eedba37113afb4b303b2b3e301 (diff) | |
| parent | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/s390/char/vmlogrdr.c')
| -rw-r--r-- | drivers/s390/char/vmlogrdr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c index 491f00c032e8..a107fec4457a 100644 --- a/drivers/s390/char/vmlogrdr.c +++ b/drivers/s390/char/vmlogrdr.c | |||
| @@ -787,6 +787,7 @@ vmlogrdr_register_device(struct vmlogrdr_priv_t *priv) { | |||
| 787 | return ret; | 787 | return ret; |
| 788 | } | 788 | } |
| 789 | priv->class_device = class_device_create( | 789 | priv->class_device = class_device_create( |
| 790 | NULL, | ||
| 790 | vmlogrdr_class, | 791 | vmlogrdr_class, |
| 791 | MKDEV(vmlogrdr_major, priv->minor_num), | 792 | MKDEV(vmlogrdr_major, priv->minor_num), |
| 792 | dev, | 793 | dev, |