diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 03:11:13 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 03:11:13 -0500 |
| commit | 36609469c8278554b046aa4cc9a5fa9ccea35306 (patch) | |
| tree | f59185b71c8059941de79143f71178453599b8f1 /arch/cris/include/asm/cputime.h | |
| parent | b3acf29afda06c76774dc6df6246c37ae707836b (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge commit 'v2.6.28-rc3' into tracing/ftrace
Diffstat (limited to 'arch/cris/include/asm/cputime.h')
| -rw-r--r-- | arch/cris/include/asm/cputime.h | 6 |
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 */ | ||