diff --git a/[refs] b/[refs] index 23c06528bfe2..7aa675e25e88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a6a2a5e0b57d25c1bf6eb9b8c958940e156b059 +refs/heads/master: 04880edae5e1027d61241beb5ac37b520755f2ab diff --git a/trunk/drivers/char/ppdev.c b/trunk/drivers/char/ppdev.c index efc485edad1c..c1e3dd837fc8 100644 --- a/trunk/drivers/char/ppdev.c +++ b/trunk/drivers/char/ppdev.c @@ -752,13 +752,13 @@ static const struct file_operations pp_fops = { static void pp_attach(struct parport *port) { - class_device_create(ppdev_class, NULL, MKDEV(PP_MAJOR, port->number), - NULL, "parport%d", port->number); + device_create(ppdev_class, NULL, MKDEV(PP_MAJOR, port->number), + "parport%d", port->number); } static void pp_detach(struct parport *port) { - class_device_destroy(ppdev_class, MKDEV(PP_MAJOR, port->number)); + device_destroy(ppdev_class, MKDEV(PP_MAJOR, port->number)); } static struct parport_driver pp_driver = {