diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:42:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:42:13 -0400 |
| commit | 4a3381feb823e06c8e2da7e283c17b0b6fdbddcf (patch) | |
| tree | e1bef4c3db854bb10fd13dc67415d77b5d999533 /include/asm-arm/page.h | |
| parent | fea63e38013ec628ab3f7fddc4c2148064b7910a (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge branch 'master' into upstream
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 63d12f0244c5..b721270b9986 100644 --- a/include/asm-arm/page.h +++ b/include/asm-arm/page.h | |||
| @@ -193,8 +193,8 @@ extern pmd_t *top_pmd; | |||
| 193 | #define ARCH_SLAB_MINALIGN 8 | 193 | #define ARCH_SLAB_MINALIGN 8 |
| 194 | #endif | 194 | #endif |
| 195 | 195 | ||
| 196 | #endif /* __KERNEL__ */ | ||
| 197 | |||
| 198 | #include <asm-generic/page.h> | 196 | #include <asm-generic/page.h> |
| 199 | 197 | ||
| 198 | #endif /* __KERNEL__ */ | ||
| 199 | |||
| 200 | #endif | 200 | #endif |