Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

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

diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index 14ceebfc1efaf5d35153b7f9e2e22b41d4320adb..326da7d500c73953624093bd6cb9ae995d8e1725 100644 (file)
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -31,16 +31,14 @@
 #define        HPET_MINOR           228
 
 struct device;
-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];
+       struct device *parent;
+       struct device *this_device;
 };
 
 extern int misc_register(struct miscdevice * misc);