projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
271fc18
)
[PATCH] Fix 'make headers_check' on ia64
author
Geert Uytterhoeven
<
[email protected]
>
Tue, 19 Sep 2006 03:12:23 +0000
(20:12 -0700)
committer
Linus Torvalds
<
[email protected]
>
Tue, 19 Sep 2006 14:59:59 +0000
(07:59 -0700)
Fix 'make headers_check' on m68k
Signed-off-by: Geert Uytterhoeven <
[email protected]
>
Cc: Roman Zippel <
[email protected]
>
Cc: David Woodhouse <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
include/asm-m68k/page.h
patch
|
blob
|
history
diff --git
a/include/asm-m68k/page.h
b/include/asm-m68k/page.h
index db017f838c2913dcff9ac66522cec7cbed82d64e..fcc165ddd09e11e789a76c04208faef6b93937ee 100644
(file)
--- a/
include/asm-m68k/page.h
+++ b/
include/asm-m68k/page.h
@@
-2,6
+2,8
@@
#define _M68K_PAGE_H
+#ifdef __KERNEL__
+
/* PAGE_SHIFT determines the page size */
#ifndef CONFIG_SUN3
#define PAGE_SHIFT (12)
@@
-15,8
+17,6
@@
#endif
#define PAGE_MASK (~(PAGE_SIZE-1))
-#ifdef __KERNEL__
-
#include <asm/setup.h>
#if PAGE_SHIFT < 13
@@
-175,8
+175,8
@@
static inline void *__va(unsigned long x)
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-#endif /* __KERNEL__ */
-
#include <asm-generic/page.h>
+#endif /* __KERNEL__ */
+
#endif /* _M68K_PAGE_H */