diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 12:26:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 12:26:44 -0700 |
commit | b2e961eb2e7a54ffaae82f8e0198b26b54ade98e (patch) | |
tree | 33e5192a4c84e717d8c2f8235f268216b01053f7 /drivers/block/ps2esdi.c | |
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 'drivers/block/ps2esdi.c')
-rw-r--r-- | drivers/block/ps2esdi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c index 688a4fb0dc99..3c796e236253 100644 --- a/drivers/block/ps2esdi.c +++ b/drivers/block/ps2esdi.c @@ -64,7 +64,7 @@ static void reset_ctrl(void); static int ps2esdi_geninit(void); -static void do_ps2esdi_request(request_queue_t * q); +static void do_ps2esdi_request(struct request_queue * q); static void ps2esdi_readwrite(int cmd, struct request *req); @@ -473,7 +473,7 @@ static void __init ps2esdi_get_device_cfg(void) } /* strategy routine that handles most of the IO requests */ -static void do_ps2esdi_request(request_queue_t * q) +static void do_ps2esdi_request(struct request_queue * q) { struct request *req; /* since, this routine is called with interrupts cleared - they |