2.6.25-rc7

 fs

diff --git a/fs/char_dev.c b/fs/char_dev.c
index c3bfa76..038674a 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -357,7 +357,7 @@ void cdev_put(struct cdev *p)
 /*
  * Called every time a character special file is opened
  */
-int chrdev_open(struct inode * inode, struct file * filp)
+static int chrdev_open(struct inode *inode, struct file *filp)
 {
    struct cdev *p;
    struct cdev *new = NULL;
@@ -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(&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(&cdev->kobj, &ktype_cdev_default);
    cdev->ops = fops;
 }