Merge with /home/shaggy/git/linus-clean/

[powerpc.git] / drivers / char / ppdev.c

diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 0e22880..306ee0f 100644 (file)
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -752,7 +752,7 @@ static struct file_operations pp_fops = {
 
 static void pp_attach(struct parport *port)
 {
-       class_device_create(ppdev_class, MKDEV(PP_MAJOR, port->number),
+       class_device_create(ppdev_class, NULL, MKDEV(PP_MAJOR, port->number),
                        NULL, "parport%d", port->number);
 }