diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
| commit | 748c5151deb56e4b7b5a9b07a884243764933831 (patch) | |
| tree | e9dd45b8806d00b56503cfa55c46f3ebce0d151c /block | |
| parent | 4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff) | |
| parent | e8b8c977734193adedf2b0f607d6252c78e86394 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'block')
| -rw-r--r-- | block/elevator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/elevator.c b/block/elevator.c index 952aee04a6..446aea2a3c 100644 --- a/block/elevator.c +++ b/block/elevator.c | |||
| @@ -390,7 +390,7 @@ EXPORT_SYMBOL(elv_rb_find); | |||
| 390 | 390 | ||
| 391 | /* | 391 | /* |
| 392 | * Insert rq into dispatch queue of q. Queue lock must be held on | 392 | * Insert rq into dispatch queue of q. Queue lock must be held on |
| 393 | * entry. rq is sort insted into the dispatch queue. To be used by | 393 | * entry. rq is sort instead into the dispatch queue. To be used by |
| 394 | * specific elevators. | 394 | * specific elevators. |
| 395 | */ | 395 | */ |
| 396 | void elv_dispatch_sort(struct request_queue *q, struct request *rq) | 396 | void elv_dispatch_sort(struct request_queue *q, struct request *rq) |