Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / include / linux / mtd / blktrans.h

diff --git a/include/linux/mtd/blktrans.h b/include/linux/mtd/blktrans.h
index 8b4aa05..b481ccd 100644 (file)
--- a/include/linux/mtd/blktrans.h
+++ b/include/linux/mtd/blktrans.h
@@ -9,6 +9,8 @@
 #define __MTD_TRANS_H__
 
 #include <linux/mutex.h>
+#include <linux/kref.h>
+#include <linux/sysfs.h>
 
 struct hd_geometry;
 struct mtd_info;
@@ -24,11 +26,16 @@ struct mtd_blktrans_dev {
        int devnum;
        unsigned long size;
        int readonly;
-       void *blkcore_priv; /* gendisk in 2.5, devfs_handle in 2.4 */
+       int open;
+       struct kref ref;
+       struct gendisk *disk;
+       struct attribute_group *disk_attributes;
+       struct task_struct *thread;
+       struct request_queue *rq;
+       spinlock_t queue_lock;
+       void *priv;
 };
 
-struct blkcore_priv; /* Differs for 2.4 and 2.5 kernels; private */
-
 struct mtd_blktrans_ops {
        char *name;
        int major;
@@ -60,8 +67,6 @@ struct mtd_blktrans_ops {
        struct list_head devs;
        struct list_head list;
        struct module *owner;
-
-       struct mtd_blkcore_priv *blkcore_priv;
 };
 
 extern int register_mtd_blktrans(struct mtd_blktrans_ops *tr);