aboutsummaryrefslogtreecommitdiff
path: root/arch/cris/include/asm/cputime.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-01 09:51:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-01 09:51:51 -0700
commit0242909a6135e10a28822c64f9ad50fdad52757c (patch)
treec5f9c8abe95a65433e6ac356871f2379c02488fe /arch/cris/include/asm/cputime.h
parent0a6d2fac615972142715d736289abeeb7382e81d (diff)
parent556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 (diff)
Merge branch 'cris_move' of git://www.jni.nu/cris
* 'cris_move' of git://www.jni.nu/cris: [CRIS] Move header files from include to arch/cris/include. [CRISv32] Remove warning in io.h
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 00000000000..4446a65656f
--- /dev/null
+++ b/arch/cris/include/asm/cputime.h
@@ -0,0 +1,6 @@
+#ifndef __CRIS_CPUTIME_H
+#define __CRIS_CPUTIME_H
+
+#include <asm-generic/cputime.h>
+
+#endif /* __CRIS_CPUTIME_H */