diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:22:35 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:22:35 +0200 |
| commit | 2d05bf6ef7391ac3642ab62bc3a649fdb32731fe (patch) | |
| tree | a8671f0eafa885b4f3ad05204e3ed642b6acab59 /include/linux/blkdev.h | |
| parent | 9c63cd5a955ce8a3de1776a9e4b6b89c69b2a09e (diff) | |
| parent | 8c0383b8f6a8012b107cd62eaa5a556586d8ea56 (diff) | |
| download | olio-linux-3.10-2d05bf6ef7391ac3642ab62bc3a649fdb32731fe.tar.xz olio-linux-3.10-2d05bf6ef7391ac3642ab62bc3a649fdb32731fe.zip | |
Merge branch 'samsung/defconfig' into next/defconfig
From Kukjin Kim <kgene.kim@samsung.com>:
It is including new exynos_defconfig for DT configuration of exynos4
and exynos5 together. The old exynos4_defconfig will be used for non-DT
for a while and we will try to move on using exynos_defconfig for only DT.
* samsung/defconfig:
ARM: exynos_defconfig: enable more platforms in defconfig
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 ba43f408baa..07954b05b86 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 *); /* |