diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-07 08:07:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-07 08:07:35 +0200 |
| commit | d763d5edf945eec47bd443b699f174976f0afc13 (patch) | |
| tree | 3e5cd46b9a783999716bf92176854f4f1215d930 /include/asm-arm/page.h | |
| parent | 790e2a290b499b0400254e6870ec27969065d122 (diff) | |
| parent | 1b40a895df6c7d5a80e71f65674060b03d84bbef (diff) | |
| download | linux-d763d5edf945eec47bd443b699f174976f0afc13.tar.bz2 | |
Merge branch 'linus' into tracing/mmiotrace
Diffstat (limited to 'include/asm-arm/page.h')
| -rw-r--r-- | include/asm-arm/page.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h index 5c22b0112106..8e05bdb5f12f 100644 --- a/include/asm-arm/page.h +++ b/include/asm-arm/page.h @@ -179,10 +179,10 @@ typedef unsigned long pgprot_t; #endif /* STRICT_MM_TYPECHECKS */ -typedef struct page *pgtable_t; - #endif /* CONFIG_MMU */ +typedef struct page *pgtable_t; + #include <asm/memory.h> #endif /* !__ASSEMBLY__ */ |