diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-09-05 00:52:09 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-09-05 00:52:09 -0700 |
| commit | a01cb2dfa8e91cb773483b2d83c778407515c876 (patch) | |
| tree | 638647b50108536fef8d62a271b4d8096e33c1d7 /include/linux/blkdev.h | |
| parent | f5b61a1fb00721206413b25f64e78edfb6b87777 (diff) | |
| parent | 7c2dd86b82e5d4e44a41c871b9d8cdad5317645f (diff) | |
Merge
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 9c7e6d86e810..285fd86e2b48 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -270,7 +270,7 @@ struct request_queue * Together with queue_head for cacheline sharing */ struct list_head queue_head; - struct list_head *last_merge; + struct request *last_merge; elevator_t elevator; /* |