diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /include/linux/mtd/blktrans.h | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'include/linux/mtd/blktrans.h')
| -rw-r--r-- | include/linux/mtd/blktrans.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mtd/blktrans.h b/include/linux/mtd/blktrans.h index 310e61606415..8b4aa0523db7 100644 --- a/include/linux/mtd/blktrans.h +++ b/include/linux/mtd/blktrans.h | |||
| @@ -41,6 +41,8 @@ struct mtd_blktrans_ops { | |||
| 41 | unsigned long block, char *buffer); | 41 | unsigned long block, char *buffer); |
| 42 | int (*writesect)(struct mtd_blktrans_dev *dev, | 42 | int (*writesect)(struct mtd_blktrans_dev *dev, |
| 43 | unsigned long block, char *buffer); | 43 | unsigned long block, char *buffer); |
| 44 | int (*discard)(struct mtd_blktrans_dev *dev, | ||
| 45 | unsigned long block, unsigned nr_blocks); | ||
| 44 | 46 | ||
| 45 | /* Block layer ioctls */ | 47 | /* Block layer ioctls */ |
| 46 | int (*getgeo)(struct mtd_blktrans_dev *dev, struct hd_geometry *geo); | 48 | int (*getgeo)(struct mtd_blktrans_dev *dev, struct hd_geometry *geo); |