Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[linux-2.6] / include / linux / miscdevice.h

diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index 14ceebfc1efaf5d35153b7f9e2e22b41d4320adb..b03cfb91e228dd993987e3b2eb497c832397e073 100644 (file)
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -36,11 +36,10 @@ struct class_device;
 struct miscdevice  {
        int minor;
        const char *name;
-       struct file_operations *fops;
+       const struct file_operations *fops;
        struct list_head list;
        struct device *dev;
        struct class_device *class;
-       char devfs_name[64];
 };
 
 extern int misc_register(struct miscdevice * misc);