diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
| commit | 30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch) | |
| tree | eb6a47cae63d3587fa773cc5a16781eaa2c7810b /include/linux/mtd/blktrans.h | |
| parent | 03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c (diff) | |
| parent | f56df2f4db6e4af87fb8e941cff69f4501a111df (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/linux/mtd/blktrans.h')
| -rw-r--r-- | include/linux/mtd/blktrans.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mtd/blktrans.h b/include/linux/mtd/blktrans.h index 72fc68c5ee9..9a6e2f953cb 100644 --- a/include/linux/mtd/blktrans.h +++ b/include/linux/mtd/blktrans.h | |||
| @@ -24,7 +24,6 @@ struct mtd_blktrans_dev { | |||
| 24 | struct mtd_info *mtd; | 24 | struct mtd_info *mtd; |
| 25 | struct mutex lock; | 25 | struct mutex lock; |
| 26 | int devnum; | 26 | int devnum; |
| 27 | int blksize; | ||
| 28 | unsigned long size; | 27 | unsigned long size; |
| 29 | int readonly; | 28 | int readonly; |
| 30 | void *blkcore_priv; /* gendisk in 2.5, devfs_handle in 2.4 */ | 29 | void *blkcore_priv; /* gendisk in 2.5, devfs_handle in 2.4 */ |
| @@ -36,6 +35,8 @@ struct mtd_blktrans_ops { | |||
| 36 | char *name; | 35 | char *name; |
| 37 | int major; | 36 | int major; |
| 38 | int part_bits; | 37 | int part_bits; |
| 38 | int blksize; | ||
| 39 | int blkshift; | ||
| 39 | 40 | ||
| 40 | /* Access functions */ | 41 | /* Access functions */ |
| 41 | int (*readsect)(struct mtd_blktrans_dev *dev, | 42 | int (*readsect)(struct mtd_blktrans_dev *dev, |