diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-20 14:59:50 -0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-20 14:59:50 -0400 |
| commit | 44e8ba93cf330f075178e31759100f367313790a (patch) | |
| tree | 27956beb159bfb603d672b43cb207690a087dd0a /include/linux/genhd.h | |
| parent | e9fe8a714e450b26f76eaf8832f5b9fe24d00e79 (diff) | |
| parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) | |
Merge commit 'v3.3' into fbdev-next
Diffstat (limited to 'include/linux/genhd.h')
| -rw-r--r-- | include/linux/genhd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index fe23ee768589..e61d3192448e 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h | |||
| @@ -596,6 +596,7 @@ extern char *disk_name (struct gendisk *hd, int partno, char *buf); | |||
| 596 | 596 | ||
| 597 | extern int disk_expand_part_tbl(struct gendisk *disk, int target); | 597 | extern int disk_expand_part_tbl(struct gendisk *disk, int target); |
| 598 | extern int rescan_partitions(struct gendisk *disk, struct block_device *bdev); | 598 | extern int rescan_partitions(struct gendisk *disk, struct block_device *bdev); |
| 599 | extern int invalidate_partitions(struct gendisk *disk, struct block_device *bdev); | ||
| 599 | extern struct hd_struct * __must_check add_partition(struct gendisk *disk, | 600 | extern struct hd_struct * __must_check add_partition(struct gendisk *disk, |
| 600 | int partno, sector_t start, | 601 | int partno, sector_t start, |
| 601 | sector_t len, int flags, | 602 | sector_t len, int flags, |