diff --git a/[refs] b/[refs] index 7e77ad124879..8c13e6f71995 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80d6679a62fe45f440d042099d997a42e4e8c59d +refs/heads/master: 868e81b8ada8fa05bdc08b5e6fa73307caaeab6d diff --git a/trunk/include/asm-h8300/page.h b/trunk/include/asm-h8300/page.h index f9f9d3eea8ed..d673077d2fd6 100644 --- a/trunk/include/asm-h8300/page.h +++ b/trunk/include/asm-h8300/page.h @@ -66,7 +66,6 @@ extern unsigned long memory_end; #define MAP_NR(addr) (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT) #define virt_to_page(addr) (mem_map + (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT)) -#define virt_to_page(addr) (mem_map + (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT)) #define page_to_virt(page) ((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET) #define pfn_valid(page) (page < max_mapnr)