diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-24 15:52:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 15:52:27 -0500 |
| commit | 87b203079ed949de52f0d92aeae20e5e0116c12f (patch) | |
| tree | 1878756f936963822ed2d51a15db1da5814973e7 /arch/powerpc/oprofile/cell/spu_profiler.c | |
| parent | 58105ef1857112a186696c9b8957020090226a28 (diff) | |
| parent | a852cbfaaf8122827602027b1614971cfd832304 (diff) | |
Merge branch 'x86/core' into core/percpu
Diffstat (limited to 'arch/powerpc/oprofile/cell/spu_profiler.c')
| -rw-r--r-- | arch/powerpc/oprofile/cell/spu_profiler.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/oprofile/cell/spu_profiler.c b/arch/powerpc/oprofile/cell/spu_profiler.c index 9305ddaac51..b129d007e7f 100644 --- a/arch/powerpc/oprofile/cell/spu_profiler.c +++ b/arch/powerpc/oprofile/cell/spu_profiler.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/smp.h> | 16 | #include <linux/smp.h> |
| 17 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
| 18 | #include <asm/cell-pmu.h> | 18 | #include <asm/cell-pmu.h> |
| 19 | #include <asm/time.h> | ||
| 19 | #include "pr_util.h" | 20 | #include "pr_util.h" |
| 20 | 21 | ||
| 21 | #define SCALE_SHIFT 14 | 22 | #define SCALE_SHIFT 14 |