diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/asm-generic/page.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-generic/page.h')
| -rw-r--r-- | include/asm-generic/page.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-generic/page.h b/include/asm-generic/page.h index a96b5d986b6e..14db733b8e68 100644 --- a/include/asm-generic/page.h +++ b/include/asm-generic/page.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_GENERIC_PAGE_H | 1 | #ifndef _ASM_GENERIC_PAGE_H |
| 2 | #define _ASM_GENERIC_PAGE_H | 2 | #define _ASM_GENERIC_PAGE_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | ||
| 5 | #ifndef __ASSEMBLY__ | 4 | #ifndef __ASSEMBLY__ |
| 6 | 5 | ||
| 7 | #include <linux/compiler.h> | 6 | #include <linux/compiler.h> |
| @@ -21,6 +20,5 @@ static __inline__ __attribute_const__ int get_order(unsigned long size) | |||
| 21 | } | 20 | } |
| 22 | 21 | ||
| 23 | #endif /* __ASSEMBLY__ */ | 22 | #endif /* __ASSEMBLY__ */ |
| 24 | #endif /* __KERNEL__ */ | ||
| 25 | 23 | ||
| 26 | #endif /* _ASM_GENERIC_PAGE_H */ | 24 | #endif /* _ASM_GENERIC_PAGE_H */ |