diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-04-27 10:48:08 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-27 10:48:08 -0400 |
| commit | cd469e0cc67b74ba41daec335ea72baedb750b80 (patch) | |
| tree | 8054cc6b13f48785165af1485a873dd3e33d4ca6 /include/asm-x86_64 | |
| parent | ad1588798620901c12ba86c71865150a4eb727bf (diff) | |
Exclude asm-generic/{page,memory_model}.h from user bits of i386/x86_64 page.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-x86_64')
| -rw-r--r-- | include/asm-x86_64/page.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86_64/page.h b/include/asm-x86_64/page.h index b59f33e6b838..f7bf875aae40 100644 --- a/include/asm-x86_64/page.h +++ b/include/asm-x86_64/page.h | |||
| @@ -135,9 +135,9 @@ typedef struct { unsigned long pgprot; } pgprot_t; | |||
| 135 | 135 | ||
| 136 | #define __HAVE_ARCH_GATE_AREA 1 | 136 | #define __HAVE_ARCH_GATE_AREA 1 |
| 137 | 137 | ||
| 138 | #endif /* __KERNEL__ */ | ||
| 139 | |||
| 140 | #include <asm-generic/memory_model.h> | 138 | #include <asm-generic/memory_model.h> |
| 141 | #include <asm-generic/page.h> | 139 | #include <asm-generic/page.h> |
| 142 | 140 | ||
| 141 | #endif /* __KERNEL__ */ | ||
| 142 | |||
| 143 | #endif /* _X86_64_PAGE_H */ | 143 | #endif /* _X86_64_PAGE_H */ |