diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-02 08:31:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-02 08:31:55 -0500 |
| commit | ae2c27a78f1df5b0967069cd3b916cff1eb044c8 (patch) | |
| tree | e67f1012e76185bac2e78bb04caa68ed1f7dc2a2 /include/asm-frv/page.h | |
| parent | a608ab9cb6a5050394498b2520c6e7c162f4e2cf (diff) | |
| parent | e34efe3b100d0fbdf053128956c3dd0bc68754d6 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-frv/page.h')
| -rw-r--r-- | include/asm-frv/page.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-frv/page.h b/include/asm-frv/page.h index 134cc0cdf6c2..213d92fd652a 100644 --- a/include/asm-frv/page.h +++ b/include/asm-frv/page.h | |||
| @@ -76,8 +76,6 @@ extern unsigned long max_pfn; | |||
| 76 | 76 | ||
| 77 | #endif /* __ASSEMBLY__ */ | 77 | #endif /* __ASSEMBLY__ */ |
| 78 | 78 | ||
| 79 | #endif /* __KERNEL__ */ | ||
| 80 | |||
| 81 | #ifdef CONFIG_CONTIGUOUS_PAGE_ALLOC | 79 | #ifdef CONFIG_CONTIGUOUS_PAGE_ALLOC |
| 82 | #define WANT_PAGE_VIRTUAL 1 | 80 | #define WANT_PAGE_VIRTUAL 1 |
| 83 | #endif | 81 | #endif |
| @@ -85,4 +83,6 @@ extern unsigned long max_pfn; | |||
| 85 | #include <asm-generic/memory_model.h> | 83 | #include <asm-generic/memory_model.h> |
| 86 | #include <asm-generic/page.h> | 84 | #include <asm-generic/page.h> |
| 87 | 85 | ||
| 86 | #endif /* __KERNEL__ */ | ||
| 87 | |||
| 88 | #endif /* _ASM_PAGE_H */ | 88 | #endif /* _ASM_PAGE_H */ |