diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
| commit | ebf8889bd1fe3615991ff4494635d237280652a2 (patch) | |
| tree | 10fb735717122bbb86474339eac07f26e7ccdf40 /include/asm-x86/cputime.h | |
| parent | b160292cc216a50fd0cd386b0bda2cd48352c73b (diff) | |
| parent | 752097cec53eea111d087c545179b421e2bde98a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-x86/cputime.h')
| -rw-r--r-- | include/asm-x86/cputime.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-x86/cputime.h b/include/asm-x86/cputime.h new file mode 100644 index 000000000000..87c37cf6b707 --- /dev/null +++ b/include/asm-x86/cputime.h | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | #ifdef CONFIG_X86_32 | ||
| 2 | # include "cputime_32.h" | ||
| 3 | #else | ||
| 4 | # include "cputime_64.h" | ||
| 5 | #endif | ||