aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris/include/asm/cputime.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-08 14:23:02 -0500
committerIngo Molnar <mingo@elte.hu>2008-11-08 14:23:02 -0500
commit895e031707954a9ca26ed4f5f794575313854ed1 (patch)
treeec7cd5515f346e6f94bc43e63d55ebc8ddf4173d /arch/cris/include/asm/cputime.h
parent838e8bb71dc0c892bf8f84abd3c709d8fe3a8d3c (diff)
parenta622cf69b806bbb1887913c04e01d0c25b892876 (diff)
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/cris/include/asm/cputime.h')
-rw-r--r--arch/cris/include/asm/cputime.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/cris/include/asm/cputime.h b/arch/cris/include/asm/cputime.h
new file mode 100644
index 000000000000..4446a65656fa
--- /dev/null
+++ b/arch/cris/include/asm/cputime.h
@@ -0,0 +1,6 @@
1#ifndef __CRIS_CPUTIME_H
2#define __CRIS_CPUTIME_H
3
4#include <asm-generic/cputime.h>
5
6#endif /* __CRIS_CPUTIME_H */