aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-sh/page.h3
-rw-r--r--include/asm-sh/ptrace.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h
index 5a057b00f19a..6f7eb8a3aba5 100644
--- a/include/asm-sh/page.h
+++ b/include/asm-sh/page.h
@@ -112,9 +112,8 @@ typedef struct { unsigned long pgprot; } pgprot_t;
112#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ 112#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
113 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) 113 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
114 114
115#endif /* __KERNEL__ */
116
117#include <asm-generic/memory_model.h> 115#include <asm-generic/memory_model.h>
118#include <asm-generic/page.h> 116#include <asm-generic/page.h>
119 117
118#endif /* __KERNEL__ */
120#endif /* __ASM_SH_PAGE_H */ 119#endif /* __ASM_SH_PAGE_H */
diff --git a/include/asm-sh/ptrace.h b/include/asm-sh/ptrace.h
index 792fc35bd624..ed358a376e6e 100644
--- a/include/asm-sh/ptrace.h
+++ b/include/asm-sh/ptrace.h
@@ -1,8 +1,6 @@
1#ifndef __ASM_SH_PTRACE_H 1#ifndef __ASM_SH_PTRACE_H
2#define __ASM_SH_PTRACE_H 2#define __ASM_SH_PTRACE_H
3 3
4#include <asm/ubc.h>
5
6/* 4/*
7 * Copyright (C) 1999, 2000 Niibe Yutaka 5 * Copyright (C) 1999, 2000 Niibe Yutaka
8 * 6 *