git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-sh64
/
page.h
diff --git
a/include/asm-sh64/page.h
b/include/asm-sh64/page.h
index
a428310
..
de207a9
100644
(file)
--- a/
include/asm-sh64/page.h
+++ b/
include/asm-sh64/page.h
@@
-17,7
+17,6
@@
*
*/
*
*/
-#include <linux/config.h>
/* PAGE_SHIFT determines the page size */
#define PAGE_SHIFT 12
/* PAGE_SHIFT determines the page size */
#define PAGE_SHIFT 12
@@
-113,11
+112,10
@@
typedef struct { unsigned long pgprot; } pgprot_t;
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-#define devmem_is_allowed(x) 1
-
-#endif /* __KERNEL__ */
-
#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
+#define devmem_is_allowed(x) 1
+
+#endif /* __KERNEL__ */
#endif /* __ASM_SH64_PAGE_H */
#endif /* __ASM_SH64_PAGE_H */