From ee808c67ed8606e8c67941826e323554c2210885 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 17 Dec 2007 23:05:35 -0700
Subject: [PATCH] --- yaml --- r: 75820 b: refs/heads/master c:
 a5815ddf26aa8208d4ad79b4fba5e6bf7d5ba688 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/fs/char_dev.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 84322b10cdc8..bbd9fb31fdc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78be3d2f574bf8a9886550ad07b8124b194badb8
+refs/heads/master: a5815ddf26aa8208d4ad79b4fba5e6bf7d5ba688
diff --git a/trunk/fs/char_dev.c b/trunk/fs/char_dev.c
index c3bfa76765c4..b2dd5a036631 100644
--- a/trunk/fs/char_dev.c
+++ b/trunk/fs/char_dev.c
@@ -510,9 +510,8 @@ struct cdev *cdev_alloc(void)
 {
 	struct cdev *p = kzalloc(sizeof(struct cdev), GFP_KERNEL);
 	if (p) {
-		p->kobj.ktype = &ktype_cdev_dynamic;
 		INIT_LIST_HEAD(&p->list);
-		kobject_init(&p->kobj);
+		kobject_init_ng(&p->kobj, &ktype_cdev_dynamic);
 	}
 	return p;
 }
@@ -529,8 +528,7 @@ void cdev_init(struct cdev *cdev, const struct file_operations *fops)
 {
 	memset(cdev, 0, sizeof *cdev);
 	INIT_LIST_HEAD(&cdev->list);
-	cdev->kobj.ktype = &ktype_cdev_default;
-	kobject_init(&cdev->kobj);
+	kobject_init_ng(&cdev->kobj, &ktype_cdev_default);
 	cdev->ops = fops;
 }