diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-08-27 19:17:07 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-08-27 19:17:07 -0700 |
| commit | b30a72a7edfc64c8929104d5c2178aca489aa559 (patch) | |
| tree | 2b26c155c318d08d946bd2d70cf815dcdb29a243 /arch/alpha/include/asm/cputime.h | |
| parent | f1c5d30e1d79bbfb60eaf189db862d3cb2bcac92 (diff) | |
| parent | c1b362e3b4d331a63915b268a33207311a439d60 (diff) | |
Merge branch 'x86/urgent' into x86/cpu
Conflicts:
arch/x86/kernel/cpu/cyrix.c
Diffstat (limited to 'arch/alpha/include/asm/cputime.h')
| -rw-r--r-- | arch/alpha/include/asm/cputime.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/alpha/include/asm/cputime.h b/arch/alpha/include/asm/cputime.h new file mode 100644 index 00000000000..19577fd9323 --- /dev/null +++ b/arch/alpha/include/asm/cputime.h @@ -0,0 +1,6 @@ +#ifndef __ALPHA_CPUTIME_H +#define __ALPHA_CPUTIME_H + +#include <asm-generic/cputime.h> + +#endif /* __ALPHA_CPUTIME_H */ |