From 260485ba0e7c5911f8480541eeec9522fe4d92e2 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 12 Sep 2006 17:00:10 +0200
Subject: [PATCH] --- yaml --- r: 41187 b: refs/heads/master c:
 04880edae5e1027d61241beb5ac37b520755f2ab h: refs/heads/master i:   41185:
 50cfed07f89a73a66faf306f28179a69d3ef9c6a   41183:
 804ae7dcff61bbd84bb0b95b4ff2325a4d716cec v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/char/ppdev.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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 = {