diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-08 10:45:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-08 10:45:31 +0200 |
| commit | 8c285645ab3b05942124020b5f0b89d3b539823a (patch) | |
| tree | db15972689f7f0b794244294836a1233beb37dd4 /kernel/trace/trace_functions.c | |
| parent | 151798f872d6b386d82cd1707ad703e981fef8f2 (diff) | |
| parent | 844970916c8e50f630ea1a6ac82f09c42b12660a (diff) | |
Merge branch 'wm8996-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Diffstat (limited to 'kernel/trace/trace_functions.c')
| -rw-r--r-- | kernel/trace/trace_functions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index 8d0e1cc4e97..c7b0c6a7db0 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c @@ -324,7 +324,8 @@ ftrace_trace_onoff_unreg(char *glob, char *cmd, char *param) } static int -ftrace_trace_onoff_callback(char *glob, char *cmd, char *param, int enable) +ftrace_trace_onoff_callback(struct ftrace_hash *hash, + char *glob, char *cmd, char *param, int enable) { struct ftrace_probe_ops *ops; void *count = (void *)-1; |