Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 020d8c06 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

[PATCH] Fix 'make headers_check' on ia64 



Fix 'make headers_check' on m68k

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 271fc18e

include/asm-m68k/page.h

+4 −4
Original line number Diff line number Diff line
@@ -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 */