diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 01:32:00 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 01:32:00 +0400 |
| commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
| tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /arch/sparc/include/asm/io.h | |
| parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
| download | linux-9e3ee1c39c0cc71222f9980ccbf87fe072897eef.tar.xz | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc/include/asm/io.h')
| -rw-r--r-- | arch/sparc/include/asm/io.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/io.h b/arch/sparc/include/asm/io.h new file mode 100644 index 000000000000..a34b2994937a --- /dev/null +++ b/arch/sparc/include/asm/io.h @@ -0,0 +1,8 @@ +#ifndef ___ASM_SPARC_IO_H +#define ___ASM_SPARC_IO_H +#if defined(__sparc__) && defined(__arch64__) +#include <asm/io_64.h> +#else +#include <asm/io_32.h> +#endif +#endif |