diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-18 23:58:24 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-18 23:58:24 +0200 |
| commit | 823d93640927d739f7c918b73fe5ec494fb27e17 (patch) | |
| tree | dea028ddd214541b76c1c26f5f21ddc46157e67e /include/linux/blkdev.h | |
| parent | 7664e969359917ba3212c5d6efdec494eaf8586e (diff) | |
| parent | d9914cf66181b8aa0929775f5c6f675c6ebc3eb5 (diff) | |
Merge branch 'fixes' into pm-sleep
The 'fixes' branch contains material the next commit depends on.
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ba43f408baa3..07954b05b86c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -827,7 +827,6 @@ extern bool __blk_end_request_err(struct request *rq, int error); extern void blk_complete_request(struct request *); extern void __blk_complete_request(struct request *); extern void blk_abort_request(struct request *); -extern void blk_abort_queue(struct request_queue *); extern void blk_unprep_request(struct request *); /* |