Merge branch 'upstream-fixes' into upstream

[pandora-kernel.git] / drivers / char / misc.c

diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 0c83751..96eb2a7 100644 (file)
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -129,7 +129,7 @@ static int misc_open(struct inode * inode, struct file * file)
        int minor = iminor(inode);
        struct miscdevice *c;
        int err = -ENODEV;
-       struct file_operations *old_fops, *new_fops = NULL;
+       const struct file_operations *old_fops, *new_fops = NULL;
        
        down(&misc_sem);
        
@@ -234,7 +234,7 @@ int misc_register(struct miscdevice * misc)
        }
        dev = MKDEV(MISC_MAJOR, misc->minor);
 
-       misc->class = class_device_create(misc_class, dev, misc->dev,
+       misc->class = class_device_create(misc_class, NULL, dev, misc->dev,
                                          "%s", misc->name);
        if (IS_ERR(misc->class)) {
                err = PTR_ERR(misc->class);