diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-30 02:58:22 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-30 02:58:22 +0200 |
| commit | 79072f38909e3d9883317238887460c39ddcc4cb (patch) | |
| tree | 28369f5a844535ff836565eefd62695b0e890fa3 /include/asm-parisc/page.h | |
| parent | [PATCH] libata: increase LBA48 max sectors to 65535 (diff) | |
| parent | Merge branch 'mv-merge' (diff) | |
| download | linux-79072f38909e3d9883317238887460c39ddcc4cb.tar.xz linux-79072f38909e3d9883317238887460c39ddcc4cb.zip | |
Merge branch 'upstream'
Diffstat (limited to 'include/asm-parisc/page.h')
| -rw-r--r-- | include/asm-parisc/page.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-parisc/page.h b/include/asm-parisc/page.h index 4a6752b0afed..9f303c0c3cd7 100644 --- a/include/asm-parisc/page.h +++ b/include/asm-parisc/page.h @@ -130,8 +130,6 @@ extern int npmem_ranges; #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) #ifndef CONFIG_DISCONTIGMEM -#define pfn_to_page(pfn) (mem_map + (pfn)) -#define page_to_pfn(page) ((unsigned long)((page) - mem_map)) #define pfn_valid(pfn) ((pfn) < max_mapnr) #endif /* CONFIG_DISCONTIGMEM */ @@ -152,6 +150,7 @@ extern int npmem_ranges; #endif /* __KERNEL__ */ +#include <asm-generic/memory_model.h> #include <asm-generic/page.h> #endif /* _PARISC_PAGE_H */ |