diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /arch/arm/include/asm/page.h | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'arch/arm/include/asm/page.h')
| -rw-r--r-- | arch/arm/include/asm/page.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h index 9c746af1bf6e..3a32af4cce30 100644 --- a/arch/arm/include/asm/page.h +++ b/arch/arm/include/asm/page.h | |||
| @@ -194,6 +194,10 @@ typedef unsigned long pgprot_t; | |||
| 194 | 194 | ||
| 195 | typedef struct page *pgtable_t; | 195 | typedef struct page *pgtable_t; |
| 196 | 196 | ||
| 197 | #ifndef CONFIG_SPARSEMEM | ||
| 198 | extern int pfn_valid(unsigned long); | ||
| 199 | #endif | ||
| 200 | |||
| 197 | #include <asm/memory.h> | 201 | #include <asm/memory.h> |
| 198 | 202 | ||
| 199 | #endif /* !__ASSEMBLY__ */ | 203 | #endif /* !__ASSEMBLY__ */ |