diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /drivers/i2o/i2o_config.c | |
parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'drivers/i2o/i2o_config.c')
-rw-r--r-- | drivers/i2o/i2o_config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2o/i2o_config.c b/drivers/i2o/i2o_config.c index 0202afb67..5f51f6ca1 100644 --- a/drivers/i2o/i2o_config.c +++ b/drivers/i2o/i2o_config.c @@ -515,7 +515,7 @@ int ioctl_html(unsigned long arg) msg[0] = NINE_WORD_MSG_SIZE|SGL_OFFSET_5; msg[5] = 0x50000000|65536; msg[7] = 0xD4000000|(kcmd.qlen); - msg[8] = virt_to_phys(query); + msg[8] = virt_to_bus(query); } token = i2o_post_wait(c, msg, 9*4, 10); @@ -592,7 +592,7 @@ int ioctl_swdl(unsigned long arg) msg[5]= swlen; msg[6]= kxfer.sw_id; msg[7]= (0xD0000000 | fragsize); - msg[8]= virt_to_phys(buffer); + msg[8]= virt_to_bus(buffer); // printk("i2o_config: swdl frag %d/%d (size %d)\n", curfrag, maxfrag, fragsize); status = i2o_post_wait(c, msg, sizeof(msg), 60); |