summaryrefslogtreecommitdiffstats
path: root/arch/blackfin/include/asm/cputime.h
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2008-09-24 11:25:31 +0200
committerRobert Richter <robert.richter@amd.com>2008-09-24 11:25:31 +0200
commitf78e80209cf143be49f268c340431ae9fa3abb74 (patch)
tree820fa64b688099dfdd93d27ba03252738ca5c7e2 /arch/blackfin/include/asm/cputime.h
parentRevert "Oprofile Multiplexing Patch" (diff)
parentLinux 2.6.27-rc5 (diff)
downloadlinux-f78e80209cf143be49f268c340431ae9fa3abb74.tar.xz
linux-f78e80209cf143be49f268c340431ae9fa3abb74.zip
Merge commit 'v2.6.27-rc5' into tip/oprofile
Conflicts: arch/x86/oprofile/nmi_int.c
Diffstat (limited to 'arch/blackfin/include/asm/cputime.h')
-rw-r--r--arch/blackfin/include/asm/cputime.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/cputime.h b/arch/blackfin/include/asm/cputime.h
new file mode 100644
index 000000000000..2b19705f9885
--- /dev/null
+++ b/arch/blackfin/include/asm/cputime.h
@@ -0,0 +1,6 @@
+#ifndef __BLACKFIN_CPUTIME_H
+#define __BLACKFIN_CPUTIME_H
+
+#include <asm-generic/cputime.h>
+
+#endif /* __BLACKFIN_CPUTIME_H */