sh: Kill off some superfluous legacy PMB special casing.

[linux-2.6-block.git] / arch / sh / include / asm / page.h

diff --git a/arch/sh/include/asm/page.h b/arch/sh/include/asm/page.h
index 61e58105adc30ea0c29e82a6d7b56f5d273b0166..3accdc5ab122ec1827ffd7aa9676e27e8ab9a5d6 100644 (file)
--- a/arch/sh/include/asm/page.h
+++ b/arch/sh/include/asm/page.h
@@ -127,12 +127,7 @@ typedef struct page *pgtable_t;
  * is not visible (it is part of the PMB mapping) and so needs to be
  * added or subtracted as required.
  */
-#if defined(CONFIG_PMB_LEGACY)
-/* phys = virt - PAGE_OFFSET - (__MEMORY_START & 0xe0000000) */
-#define PMB_OFFSET     (PAGE_OFFSET - PXSEG(__MEMORY_START))
-#define __pa(x)        ((unsigned long)(x) - PMB_OFFSET)
-#define __va(x)        ((void *)((unsigned long)(x) + PMB_OFFSET))
-#elif defined(CONFIG_32BIT)
+#ifdef CONFIG_PMB
 #define __pa(x)        ((unsigned long)(x)-PAGE_OFFSET+__MEMORY_START)
 #define __va(x)        ((void *)((unsigned long)(x)+PAGE_OFFSET-__MEMORY_START))
 #else