diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-04 17:34:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-04 17:34:06 -0700 |
| commit | 707c584e15d51d1094f75566cc9957d59306dfda (patch) | |
| tree | ebe6cc34936e7441341f24531d2b0222b588f48c /include/linux/blkdev.h | |
| parent | c81eb7f2446ad21be044121f2b7a500a7c506526 (diff) | |
| parent | b99c26562c4af97cd31ccb0b29c649b4d0816e1a (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
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; /* |