diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 02:19:48 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 02:19:48 -0500 |
commit | 818fa7f3908c7bd6c0045e9d94dc23a899ef6144 (patch) | |
tree | ad3435c3f57c8222ad61709b716168932f13be6c /drivers/block/cciss_cmd.h | |
parent | 3fd4bc015ef879a7d2b955ce97fb125e3a51ba7e (diff) | |
parent | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (diff) |
Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2
Diffstat (limited to 'drivers/block/cciss_cmd.h')
-rw-r--r-- | drivers/block/cciss_cmd.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/cciss_cmd.h b/drivers/block/cciss_cmd.h index 43bf5593b59b..24e22dea1a99 100644 --- a/drivers/block/cciss_cmd.h +++ b/drivers/block/cciss_cmd.h | |||
@@ -265,8 +265,7 @@ typedef struct _CommandList_struct { | |||
265 | int ctlr; | 265 | int ctlr; |
266 | int cmd_type; | 266 | int cmd_type; |
267 | long cmdindex; | 267 | long cmdindex; |
268 | struct _CommandList_struct *prev; | 268 | struct hlist_node list; |
269 | struct _CommandList_struct *next; | ||
270 | struct request * rq; | 269 | struct request * rq; |
271 | struct completion *waiting; | 270 | struct completion *waiting; |
272 | int retry_count; | 271 | int retry_count; |