diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
| commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
| tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /include/asm-sh/unistd.h | |
| parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-sh/unistd.h')
| -rw-r--r-- | include/asm-sh/unistd.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h index 4b21f369c28c..65be656ead7d 100644 --- a/include/asm-sh/unistd.h +++ b/include/asm-sh/unistd.h | |||
| @@ -1,5 +1,13 @@ | |||
| 1 | #ifdef CONFIG_SUPERH32 | 1 | #ifdef __KERNEL__ |
| 2 | # include "unistd_32.h" | 2 | # ifdef CONFIG_SUPERH32 |
| 3 | # include "unistd_32.h" | ||
| 4 | # else | ||
| 5 | # include "unistd_64.h" | ||
| 6 | # endif | ||
| 3 | #else | 7 | #else |
| 4 | # include "unistd_64.h" | 8 | # ifdef __SH5__ |
| 9 | # include "unistd_64.h" | ||
| 10 | # else | ||
| 11 | # include "unistd_32.h" | ||
| 12 | # endif | ||
| 5 | #endif | 13 | #endif |