diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-16 16:16:34 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-16 16:16:34 +0100 |
commit | 32dc496b47eb31f7a1d115a2708e8ef1d054e1fb (patch) | |
tree | b0ae57b9b55a0277395934ea75de00f8f54d227a /block/blk.h | |
parent | 8cd50e8e2b416c7f07b267ab3457c6c25a540ba9 (diff) | |
parent | c5ab660db9a98187667d017bb9425f0c1dc76ac1 (diff) |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'block/blk.h')
-rw-r--r-- | block/blk.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk.h b/block/blk.h index 24fcaeeaf62..5dfc41267a0 100644 --- a/block/blk.h +++ b/block/blk.h @@ -70,8 +70,8 @@ void blk_queue_congestion_threshold(struct request_queue *q); int blk_dev_init(void); -void elv_quisce_start(struct request_queue *q); -void elv_quisce_end(struct request_queue *q); +void elv_quiesce_start(struct request_queue *q); +void elv_quiesce_end(struct request_queue *q); /* |