diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 15:26:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 15:26:44 -0400 |
| commit | b2e961eb2e7a54ffaae82f8e0198b26b54ade98e (patch) | |
| tree | 33e5192a4c84e717d8c2f8235f268216b01053f7 /arch/um | |
| parent | b8c1c5da1520977cb55a358f20fc09567d40cad9 (diff) | |
| parent | 71f65e6bd7651610d2d6aeb3c12aab63667ace30 (diff) | |
Merge branch 'request-queue-t' of git://git.kernel.dk/linux-2.6-block
* 'request-queue-t' of git://git.kernel.dk/linux-2.6-block:
[BLOCK] Add request_queue_t and mark it deprecated
[BLOCK] Get rid of request_queue_t typedef
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/drivers/ubd_kern.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index fc27f6c72b41..aff661fe2ee1 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c | |||
| @@ -469,7 +469,7 @@ __uml_help(fakehd, | |||
| 469 | " Change the ubd device name to \"hd\".\n\n" | 469 | " Change the ubd device name to \"hd\".\n\n" |
| 470 | ); | 470 | ); |
| 471 | 471 | ||
| 472 | static void do_ubd_request(request_queue_t * q); | 472 | static void do_ubd_request(struct request_queue * q); |
| 473 | 473 | ||
| 474 | /* Only changed by ubd_init, which is an initcall. */ | 474 | /* Only changed by ubd_init, which is an initcall. */ |
| 475 | int thread_fd = -1; | 475 | int thread_fd = -1; |
| @@ -1081,7 +1081,7 @@ static void prepare_request(struct request *req, struct io_thread_req *io_req, | |||
| 1081 | } | 1081 | } |
| 1082 | 1082 | ||
| 1083 | /* Called with dev->lock held */ | 1083 | /* Called with dev->lock held */ |
| 1084 | static void do_ubd_request(request_queue_t *q) | 1084 | static void do_ubd_request(struct request_queue *q) |
| 1085 | { | 1085 | { |
| 1086 | struct io_thread_req *io_req; | 1086 | struct io_thread_req *io_req; |
| 1087 | struct request *req; | 1087 | struct request *req; |