diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
| commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
| tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /drivers/fc4/soc.c | |
| parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) | |
Merge with Linux 2.3.41.
Diffstat (limited to 'drivers/fc4/soc.c')
| -rw-r--r-- | drivers/fc4/soc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/fc4/soc.c b/drivers/fc4/soc.c index c44c3fc8c..329c2ae45 100644 --- a/drivers/fc4/soc.c +++ b/drivers/fc4/soc.c @@ -668,7 +668,7 @@ static inline void soc_init(struct sbus_dev *sdev, int no) memset (cq, 0, sizeof(cq)); size = (SOC_CQ_REQ0_SIZE + SOC_CQ_REQ1_SIZE) * sizeof(soc_req); - s->req_cpu = sbus_alloc_consistant(sdev, size, &s->req_dvma); + s->req_cpu = sbus_alloc_consistent(sdev, size, &s->req_dvma); s->req[0].pool = s->req_cpu; cq[0].address = s->req_dvma; s->req[1].pool = s->req[0].pool + SOC_CQ_REQ0_SIZE; @@ -765,7 +765,7 @@ void cleanup_module(void) sbus_iounmap(s->xram, sdev->reg_addrs[1].reg_size); sbus_iounmap(s->regs, sdev->reg_addrs[2].reg_size); } - sbus_free_consistant(sdev, + sbus_free_consistent(sdev, (SOC_CQ_REQ0_SIZE+SOC_CQ_REQ1_SIZE)*sizeof(soc_req), s->req_cpu, s->req_dvma); } |