projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
[cascardo/linux.git]
/
include
/
asm-generic
/
page.h
diff --git
a/include/asm-generic/page.h
b/include/asm-generic/page.h
index
a96b5d9
..
14db733
100644
(file)
--- a/
include/asm-generic/page.h
+++ b/
include/asm-generic/page.h
@@
-1,7
+1,6
@@
#ifndef _ASM_GENERIC_PAGE_H
#define _ASM_GENERIC_PAGE_H
#ifndef _ASM_GENERIC_PAGE_H
#define _ASM_GENERIC_PAGE_H
-#ifdef __KERNEL__
#ifndef __ASSEMBLY__
#include <linux/compiler.h>
#ifndef __ASSEMBLY__
#include <linux/compiler.h>
@@
-21,6
+20,5
@@
static __inline__ __attribute_const__ int get_order(unsigned long size)
}
#endif /* __ASSEMBLY__ */
}
#endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
#endif /* _ASM_GENERIC_PAGE_H */
#endif /* _ASM_GENERIC_PAGE_H */