Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris

* 'io_remap_pfn_range' of git://www.jni.nu/cris:
CRIS: Define io_remap_pfn_range as remap_pfn_range

+3
+3
arch/cris/include/asm/pgtable.h
··· 260 #define pgd_ERROR(e) \ 261 printk("%s:%d: bad pgd %p(%08lx).\n", __FILE__, __LINE__, &(e), pgd_val(e)) 262 263 264 extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; /* defined in head.S */ 265
··· 260 #define pgd_ERROR(e) \ 261 printk("%s:%d: bad pgd %p(%08lx).\n", __FILE__, __LINE__, &(e), pgd_val(e)) 262 263 + #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 264 + remap_pfn_range(vma, vaddr, pfn, size, prot) 265 + 266 267 extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; /* defined in head.S */ 268