aboutsummaryrefslogtreecommitdiff
path: root/include/asm-x86/cputime.h
diff options
context:
space:
mode:
authorBrian Gerst <bgerst@didntduck.org>2007-10-15 13:57:46 +0200
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>2007-10-17 20:17:08 +0200
commit020bd9f1c766ca743556461a70a5b5d559b7e60c (patch)
tree73833b4a886620c0ccfd79ffb3a98a04206eaeb3 /include/asm-x86/cputime.h
parentc65916fe3586521932fbd1b734f39744657f2f0d (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.h')
-rw-r--r--include/asm-x86/cputime.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-x86/cputime.h b/include/asm-x86/cputime.h
index 87c37cf6b70..6d68ad7e0ea 100644
--- a/include/asm-x86/cputime.h
+++ b/include/asm-x86/cputime.h
@@ -1,5 +1 @@
-#ifdef CONFIG_X86_32
-# include "cputime_32.h"
-#else
-# include "cputime_64.h"
-#endif
+#include <asm-generic/cputime.h>