diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
| commit | 596c96ba06e5d56e72451e02f93f4e15e17458df (patch) | |
| tree | 78bc640acacb8faeb621c51296e99dbb0533a147 /drivers/char/ppdev.c | |
| parent | ad18b0ea089928367185e13d11424aea91d4b41f (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/char/ppdev.c')
| -rw-r--r-- | drivers/char/ppdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index 0e22880432bc..306ee0f091a4 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c | |||
| @@ -752,7 +752,7 @@ static struct file_operations pp_fops = { | |||
| 752 | 752 | ||
| 753 | static void pp_attach(struct parport *port) | 753 | static void pp_attach(struct parport *port) |
| 754 | { | 754 | { |
| 755 | class_device_create(ppdev_class, MKDEV(PP_MAJOR, port->number), | 755 | class_device_create(ppdev_class, NULL, MKDEV(PP_MAJOR, port->number), |
| 756 | NULL, "parport%d", port->number); | 756 | NULL, "parport%d", port->number); |
| 757 | } | 757 | } |
| 758 | 758 | ||