diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
| commit | 0e789314f8c0b50bd19bf08dc5624b9604d60183 (patch) | |
| tree | 64b6b9655e944284937f5eeff643f0754f35d0af /include/linux/iocontext.h | |
| parent | f5dec51172b81db226a23f309bc737ad021af35b (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'include/linux/iocontext.h')
| -rw-r--r-- | include/linux/iocontext.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h index a0bb301afac0..64d529133031 100644 --- a/include/linux/iocontext.h +++ b/include/linux/iocontext.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | struct cfq_queue; | 7 | struct cfq_queue; |
| 8 | struct cfq_io_context { | 8 | struct cfq_io_context { |
| 9 | void *key; | 9 | void *key; |
| 10 | unsigned long dead_key; | ||
| 11 | 10 | ||
| 12 | struct cfq_queue *cfqq[2]; | 11 | struct cfq_queue *cfqq[2]; |
| 13 | 12 | ||