The patch titled
h8300 remove duplicate define
has been added to the -mm tree. Its filename is
h8300-remove-duplicate-define.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: h8300 remove duplicate define
From: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-h8300/page.h | 1 -
1 file changed, 1 deletion(-)
diff -puN include/asm-h8300/page.h~h8300-remove-duplicate-define include/asm-h8300/page.h
--- a/include/asm-h8300/page.h~h8300-remove-duplicate-define
+++ a/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)
_
Patches currently in -mm which might be from ysato@xxxxxxxxxxxxxxxxxxxx are
h8300-remove-duplicate-define.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
