diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
| commit | f974a8ec96571535ee07880a023bcce0e3f2c76b (patch) | |
| tree | 5cf09207b1ad292a55275cd0b24999fa29b9dfe8 /include/asm-arm/page.h | |
| parent | c0b8556f2f8146bd38324b14b1ce00f249ba8ed9 (diff) | |
| parent | 4ed47896935573c8423d05bddda3f269d6e6c613 (diff) | |
Merge branch 'machtypes' into pxa-palm
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; | |||
| 179 | 179 | ||
| 180 | #endif /* STRICT_MM_TYPECHECKS */ | 180 | #endif /* STRICT_MM_TYPECHECKS */ |
| 181 | 181 | ||
| 182 | typedef struct page *pgtable_t; | ||
| 183 | |||
| 184 | #endif /* CONFIG_MMU */ | 182 | #endif /* CONFIG_MMU */ |
| 185 | 183 | ||
| 184 | typedef struct page *pgtable_t; | ||
| 185 | |||
| 186 | #include <asm/memory.h> | 186 | #include <asm/memory.h> |
| 187 | 187 | ||
| 188 | #endif /* !__ASSEMBLY__ */ | 188 | #endif /* !__ASSEMBLY__ */ |