Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
  sh64: Kill off virt_to_bus()/bus_to_virt().
  sh64: Fix irq_intc build failure.
  sh64: Fix fs.h removal from mm.h regressions.

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/sh64/kernel/pci-dma.c b/arch/sh64/kernel/pci-dma.c
index a36c3d71a3fe..a9328f894755 100644
--- a/arch/sh64/kernel/pci-dma.c
+++ b/arch/sh64/kernel/pci-dma.c
@@ -30,7 +30,7 @@ void *consistent_alloc(struct pci_dev *hwdev, size_t size,
 
         if (vp != NULL) {
                 memset(vp, 0, size);
-                *dma_handle = virt_to_bus(ret);
+                *dma_handle = virt_to_phys(ret);
                 dma_cache_wback_inv((unsigned long)ret, size);
         }
 
@@ -42,7 +42,7 @@ void consistent_free(struct pci_dev *hwdev, size_t size,
 {
         void *alloc;
 
-        alloc = bus_to_virt((unsigned long)dma_handle);
+        alloc = phys_to_virt((unsigned long)dma_handle);
         free_pages((unsigned long)alloc, get_order(size));
 
         iounmap(vaddr);