Merge branch 'x86/core' into x86/xsave

[mv-sheeva.git] / arch / h8300 / mm / memory.c

diff --git a/arch/h8300/mm/memory.c b/arch/h8300/mm/memory.c
index f4ddece3216f9f0f88955fe879330df91496ec7e..ccd6ade816dd027cc86653f7050cc7d132602cd2 100644 (file)
--- a/arch/h8300/mm/memory.c
+++ b/arch/h8300/mm/memory.c
@@ -17,7 +17,6 @@
  *  Copyright (C) 1995  Hamish Macdonald
  */
 
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -55,16 +54,3 @@ unsigned long kernel_map(unsigned long paddr, unsigned long size,
        return paddr;
 }
 
-#ifdef MAGIC_ROM_PTR
-
-int is_in_rom(unsigned long addr)
-{
-       /* Anything not in operational RAM is returned as in rom! */
-       if (addr < _ramstart || addr >= _ramend)
-               return 1;
-       else
-               return 0;
-}
-
-#endif
-