fix build error

diff --git a/arch/h8300/include/asm/barrier.h b/arch/h8300/include/asm/barrier.h
index 5177fb0..f514fd6 100644 (file)
--- a/arch/h8300/include/asm/barrier.h
+++ b/arch/h8300/include/asm/barrier.h
@@ -11,8 +11,6 @@
 #define rmb()  asm volatile (""   : : :"memory")
 #define wmb()  asm volatile (""   : : :"memory")
 #define set_mb(var, value) do { xchg(&var, value); } while (0)
-#define read_barrier_depends() do { } while(0)
-
 #define read_barrier_depends() do { } while (0)
 
 #ifdef CONFIG_SMP

diff --git a/arch/h8300/include/asm/pgtable.h b/arch/h8300/include/asm/pgtable.h
index c90edda..75d7702 100644 (file)
--- a/arch/h8300/include/asm/pgtable.h
+++ b/arch/h8300/include/asm/pgtable.h
@@ -24,8 +24,6 @@ static inline int pte_file(pte_t pte) { return 0; }
  */
 #define ZERO_PAGE(vaddr)       (virt_to_page(0))
 
-#define io_remap_pfn_range(vma, vaddr, pfn, size, prot)                \
-               remap_pfn_range(vma, vaddr, pfn, size, prot)
 /*
  * These would be in other places but having them here reduces the diffs.
  */

diff --git a/arch/h8300/kernel/syscalls.S b/arch/h8300/kernel/syscalls.S
index 73c0c5d..3114f88 100644 (file)
--- a/arch/h8300/kernel/syscalls.S
+++ b/arch/h8300/kernel/syscalls.S
@@ -2,7 +2,6 @@
 #include <linux/sys.h>
 #include <asm/linkage.h>
 #include <asm/unistd.h>
-<<<<<<< HEAD
        
        .global _sys_call_table