diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-26 23:11:03 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-26 23:11:03 +0200 |
| commit | 8b0ee07e108b2eefdab5bb73f33223f18926c3b2 (patch) | |
| tree | f68ca04180c5488301a40ec212ef2eb2467cf56c /drivers/block/sx8.c | |
| parent | [PATCH] smc91c92_cs: Reduce stack usage in smc91c92_event() (diff) | |
| parent | Merge 'drm-3264' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-8b0ee07e108b2eefdab5bb73f33223f18926c3b2.tar.xz linux-8b0ee07e108b2eefdab5bb73f33223f18926c3b2.zip | |
Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
Diffstat (limited to 'drivers/block/sx8.c')
| -rw-r--r-- | drivers/block/sx8.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c index 797f5988c2b5..5ed3a6379452 100644 --- a/drivers/block/sx8.c +++ b/drivers/block/sx8.c @@ -614,7 +614,7 @@ static int carm_array_info (struct carm_host *host, unsigned int array_idx) spin_unlock_irq(&host->lock); DPRINTK("blk_insert_request, tag == %u\n", idx); - blk_insert_request(host->oob_q, crq->rq, 1, crq, 0); + blk_insert_request(host->oob_q, crq->rq, 1, crq); return 0; @@ -653,7 +653,7 @@ static int carm_send_special (struct carm_host *host, carm_sspc_t func) crq->msg_bucket = (u32) rc; DPRINTK("blk_insert_request, tag == %u\n", idx); - blk_insert_request(host->oob_q, crq->rq, 1, crq, 0); + blk_insert_request(host->oob_q, crq->rq, 1, crq); return 0; } |