[PATCH] b44: fix manual speed/duplex/autoneg settings

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

diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h
index 324e6cc5ecf71c90d66fa90fe459e944791f6c86..a5559e38744ee2b21c061b3b0d37162f7f2dcd72 100644 (file)
--- a/include/asm-sh/page.h
+++ b/include/asm-sh/page.h
@@ -13,7 +13,6 @@
    [ P4 control   ]            0xE0000000
  */
 
-#include <linux/config.h>
 
 /* PAGE_SHIFT determines the page size */
 #define PAGE_SHIFT     12
@@ -93,11 +92,6 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 
 #define __MEMORY_START         CONFIG_MEMORY_START
 #define __MEMORY_SIZE          CONFIG_MEMORY_SIZE
-#ifdef CONFIG_DISCONTIGMEM
-/* Just for HP690, for now.. */
-#define __MEMORY_START_2ND     (__MEMORY_START+0x02000000)
-#define __MEMORY_SIZE_2ND      0x001000000 /* 16MB */
-#endif
 
 #define PAGE_OFFSET            (0x80000000UL)
 #define __pa(x)                        ((unsigned long)(x)-PAGE_OFFSET)
@@ -105,16 +99,12 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 
 #define MAP_NR(addr)           (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT)
 
-#ifndef CONFIG_DISCONTIGMEM
 #define phys_to_page(phys)     (mem_map + (((phys)-__MEMORY_START) >> PAGE_SHIFT))
 #define page_to_phys(page)     (((page - mem_map) << PAGE_SHIFT) + __MEMORY_START)
-#endif
 
 /* PFN start number, because of __MEMORY_START */
 #define PFN_START              (__MEMORY_START >> PAGE_SHIFT)
-
-#define pfn_to_page(pfn)       (mem_map + (pfn) - PFN_START)
-#define page_to_pfn(page)      ((unsigned long)((page) - mem_map) + PFN_START)
+#define ARCH_PFN_OFFSET                (FPN_START)
 #define virt_to_page(kaddr)    pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
 #define pfn_valid(pfn)         (((pfn) - PFN_START) < max_mapnr)
 #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
@@ -124,6 +114,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 
 #endif /* __KERNEL__ */
 
+#include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
 #endif /* __ASM_SH_PAGE_H */