diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-13 06:29:45 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-13 06:29:45 -0400 |
| commit | c30f33437c3f85ec48353a1ef811e148217a2aaf (patch) | |
| tree | d5a0ca1e8d091a30fece2e9aeed285225c026049 /include/linux/blkdev.h | |
| parent | 132cc538cd90f60a0b5df6a512dfd4bc5fe2039a (diff) | |
| parent | 2ec24ff1d1875defa742c76c9c7d74dca06b7e1f (diff) | |
Merge branch 'for-linus' into for-2.6.33
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 25119041e034..221cecd86bd3 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -1172,11 +1172,7 @@ static inline void put_dev_sector(Sector p) | |||
| 1172 | } | 1172 | } |
| 1173 | 1173 | ||
| 1174 | struct work_struct; | 1174 | struct work_struct; |
| 1175 | struct delayed_work; | ||
| 1176 | int kblockd_schedule_work(struct request_queue *q, struct work_struct *work); | 1175 | int kblockd_schedule_work(struct request_queue *q, struct work_struct *work); |
| 1177 | int kblockd_schedule_delayed_work(struct request_queue *q, | ||
| 1178 | struct delayed_work *work, | ||
| 1179 | unsigned long delay); | ||
| 1180 | 1176 | ||
| 1181 | #define MODULE_ALIAS_BLOCKDEV(major,minor) \ | 1177 | #define MODULE_ALIAS_BLOCKDEV(major,minor) \ |
| 1182 | MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor)) | 1178 | MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor)) |