REMOVE OMAP LEGACY CODE: Reset mach-omap1/board-*.c files to mainline

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / mmu.c

diff --git a/arch/arm/mach-omap1/mmu.c b/arch/arm/mach-omap1/mmu.c
index 3bb3efe54d9b5d2837ecfbbc29702b6e1b5f89b0..75dd310a9073921264659e6e8f34cac93718d661 100644 (file)
--- a/arch/arm/mach-omap1/mmu.c
+++ b/arch/arm/mach-omap1/mmu.c
@@ -22,7 +22,7 @@
 #include <linux/err.h>
 #include "mmu.h"
 #include <asm/tlbflush.h>
-#include <asm/arch/dsp_common.h>
+#include <mach/dsp_common.h>
 
 static void *dspvect_page;
 #define DSP_INIT_PAGE  0xfff000
@@ -198,7 +198,7 @@ static int omap1_mmu_startup(struct omap_mmu *mmu)
 {
        dspvect_page = (void *)__get_dma_pages(GFP_KERNEL, 0);
        if (dspvect_page == NULL) {
-               dev_err(&mmu->dev, "MMU %s: failed to allocate memory "
+               dev_err(mmu->dev, "MMU %s: failed to allocate memory "
                        "for vector table\n", mmu->name);
                return -ENOMEM;
        }
@@ -240,7 +240,7 @@ omap1_mmu_cam_ram_alloc(struct omap_mmu *mmu, struct omap_mmu_tlb_entry *entry)
        struct cam_ram_regset *cr;
 
        if (entry->va & ~(get_cam_va_mask(entry->pgsz))) {
-               dev_err(&mmu->dev, "MMU %s: mapping vadr (0x%06lx) is not on"
+               dev_err(mmu->dev, "MMU %s: mapping vadr (0x%06lx) is not on"
                        " an aligned boundary\n", mmu->name, entry->va);
                return ERR_PTR(-EINVAL);
        }