Merge git://git.infradead.org/embedded-2.6

[linux-2.6-omap-h63xx.git] / arch / sparc / mm / generic.c

diff --git a/arch/sparc/mm/generic.c b/arch/sparc/mm/generic.c
index 2cb0728cee052012c7856b017f7499fa5638ce82..a289261da9fdb35e06d074de83c106e9a7ab6193 100644 (file)
--- a/arch/sparc/mm/generic.c
+++ b/arch/sparc/mm/generic.c
@@ -1,4 +1,4 @@
-/* $Id: generic.c,v 1.14 2001/12/21 04:56:15 davem Exp $
+/*
  * generic.c: Generic Sparc mm routines that are not dependent upon
  *            MMU type but are Sparc specific.
  *
@@ -76,7 +76,6 @@ int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
        vma->vm_pgoff = (offset >> PAGE_SHIFT) |
                ((unsigned long)space << 28UL);
 
-       prot = __pgprot(pg_iobits);
        offset -= from;
        dir = pgd_offset(mm, from);
        flush_cache_range(vma, beg, end);