diff options
| author | Brian Gerst <bgerst@didntduck.org> | 2007-10-15 07:57:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:17:08 -0400 |
| commit | 020bd9f1c766ca743556461a70a5b5d559b7e60c (patch) | |
| tree | 73833b4a886620c0ccfd79ffb3a98a04206eaeb3 /include/asm-x86/cputime_64.h | |
| parent | c65916fe3586521932fbd1b734f39744657f2f0d (diff) | |
x86: trivial header merges
Merge 32/64-bit headers that simply redirect to asm-generic
[tglx: fixup Kbuild as well]
Signed-off-by: Brian Gerst <bgerst@didntduck.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/cputime_64.h')
| -rw-r--r-- | include/asm-x86/cputime_64.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-x86/cputime_64.h b/include/asm-x86/cputime_64.h deleted file mode 100644 index a07012dc5a3c..000000000000 --- a/include/asm-x86/cputime_64.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #ifndef __X86_64_CPUTIME_H | ||
| 2 | #define __X86_64_CPUTIME_H | ||
| 3 | |||
| 4 | #include <asm-generic/cputime.h> | ||
| 5 | |||
| 6 | #endif /* __X86_64_CPUTIME_H */ | ||