git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
[sfrench/cifs-2.6.git]
/
include
/
asm-sh
/
page.h
diff --git
a/include/asm-sh/page.h
b/include/asm-sh/page.h
index 002e64a4f04950b8fd879cb99d07ed7fadf21c1c..e0fe02950f522b067d75bd8cf4f2d5ecbfeaf41c 100644
(file)
--- a/
include/asm-sh/page.h
+++ b/
include/asm-sh/page.h
@@
-7,8
+7,6
@@
#include <linux/const.h>
-#ifdef __KERNEL__
-
/* PAGE_SHIFT determines the page size */
#if defined(CONFIG_PAGE_SIZE_4KB)
# define PAGE_SHIFT 12
@@
-178,5
+176,4
@@
typedef struct { unsigned long pgd; } pgd_t;
#define ARCH_SLAB_MINALIGN 8
#endif
-#endif /* __KERNEL__ */
#endif /* __ASM_SH_PAGE_H */