diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-15 06:19:52 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-15 06:19:52 -0400 |
| commit | 4210606b19852dce52ed1a687db816695b6048e1 (patch) | |
| tree | fd0762f88dc54560d87fc1e523741d92228f6a9c /kernel/trace/trace_functions.c | |
| parent | 4d8cfa4642f7d8fafa4d60f05dd34fe8c3b9fa45 (diff) | |
| parent | b7ae6f31d8243ec684af16bc5c763eccdfabaec0 (diff) | |
Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-pxa
Diffstat (limited to 'kernel/trace/trace_functions.c')
| -rw-r--r-- | kernel/trace/trace_functions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index b863f93b30f3..38fe1483c508 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c | |||
| @@ -199,7 +199,7 @@ static int func_set_flag(u32 old_flags, u32 bit, int set) | |||
| 199 | return 0; | 199 | return 0; |
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | static struct tracer function_trace __read_mostly = | 202 | static struct tracer function_trace __tracer_data = |
| 203 | { | 203 | { |
| 204 | .name = "function", | 204 | .name = "function", |
| 205 | .init = function_trace_init, | 205 | .init = function_trace_init, |