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-sparc/pgalloc.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-sparc/pgalloc.h')
| -rw-r--r-- | include/asm-sparc/pgalloc.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-sparc/pgalloc.h b/include/asm-sparc/pgalloc.h deleted file mode 100644 index 7fa02b53d392..000000000000 --- a/include/asm-sparc/pgalloc.h +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | #ifndef ___ASM_SPARC_PGALLOC_H | ||
| 2 | #define ___ASM_SPARC_PGALLOC_H | ||
| 3 | #if defined(__sparc__) && defined(__arch64__) | ||
| 4 | #include <asm-sparc/pgalloc_64.h> | ||
| 5 | #else | ||
| 6 | #include <asm-sparc/pgalloc_32.h> | ||
| 7 | #endif | ||
| 8 | #endif | ||