diff options
| author | J. Bruce Fields | 2009-10-27 23:45:17 +0100 |
|---|---|---|
| committer | J. Bruce Fields | 2009-10-27 23:45:17 +0100 |
| commit | e343eb0d60f74547e0aeb5bd151105c2e6cfe588 (patch) | |
| tree | 92586df0daf3298262a957640e5c86679c963f41 /drivers/firmware/iscsi_ibft.c | |
| parent | nfsd41: use sv_max_mesg for forechannel max sizes (diff) | |
| parent | Linux 2.6.32-rc5 (diff) | |
| download | kernel-qcow2-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.tar.gz kernel-qcow2-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.tar.xz kernel-qcow2-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.zip | |
Merge commit 'v2.6.32-rc5' into for-2.6.33
Diffstat (limited to 'drivers/firmware/iscsi_ibft.c')
| -rw-r--r-- | drivers/firmware/iscsi_ibft.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c index 420a96e7f2db..051d1ebbd287 100644 --- a/drivers/firmware/iscsi_ibft.c +++ b/drivers/firmware/iscsi_ibft.c @@ -939,7 +939,7 @@ static int __init ibft_init(void) if (ibft_addr) { printk(KERN_INFO "iBFT detected at 0x%llx.\n", - (u64)virt_to_phys((void *)ibft_addr)); + (u64)isa_virt_to_bus(ibft_addr)); rc = ibft_check_device(); if (rc) |