X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fchar_dev.c;h=2c7a8b5b45989b25d40f8cb6a283d7ffb8940c5a;hb=533083836fd55ca67ce35ab3d914b74ec1a5b9a8;hp=b2dd5a0366316b4df53d0d208b444b4ca74bdd37;hpb=a5815ddf26aa8208d4ad79b4fba5e6bf7d5ba688;p=linux-2.6 diff --git a/fs/char_dev.c b/fs/char_dev.c index b2dd5a0366..2c7a8b5b45 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c @@ -511,7 +511,7 @@ struct cdev *cdev_alloc(void) struct cdev *p = kzalloc(sizeof(struct cdev), GFP_KERNEL); if (p) { INIT_LIST_HEAD(&p->list); - kobject_init_ng(&p->kobj, &ktype_cdev_dynamic); + kobject_init(&p->kobj, &ktype_cdev_dynamic); } return p; } @@ -528,7 +528,7 @@ void cdev_init(struct cdev *cdev, const struct file_operations *fops) { memset(cdev, 0, sizeof *cdev); INIT_LIST_HEAD(&cdev->list); - kobject_init_ng(&cdev->kobj, &ktype_cdev_default); + kobject_init(&cdev->kobj, &ktype_cdev_default); cdev->ops = fops; }