diff options
| author | Luca Coelho <luciano.coelho@intel.com> | 2016-05-10 10:30:56 +0300 |
|---|---|---|
| committer | Luca Coelho <luciano.coelho@intel.com> | 2016-05-10 10:30:56 +0300 |
| commit | bae6692c24236d0203f88a444986d86437a858fa (patch) | |
| tree | 0f9bee1250af3046fa46049736b615b81e60f56e /tools/perf/util/machine.h | |
| parent | 46167a8fd4248533ad15867e6988ff20e76de641 (diff) | |
| parent | 57fbcce37be7c1d2622b56587c10ade00e96afa3 (diff) | |
Merge tag 'mac80211-next-for-davem-2016-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next into master
To synchronize with Kalle, here's just a big change that affects
all drivers - removing the duplicated enum ieee80211_band and
replacing it by enum nl80211_band. On top of that, just a small
documentation update.
Diffstat (limited to 'tools/perf/util/machine.h')
| -rw-r--r-- | tools/perf/util/machine.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h index 1a3e45baf97f..8499db281158 100644 --- a/tools/perf/util/machine.h +++ b/tools/perf/util/machine.h @@ -94,7 +94,7 @@ int machine__process_aux_event(struct machine *machine, union perf_event *event); int machine__process_itrace_start_event(struct machine *machine, union perf_event *event); -int machine__process_switch_event(struct machine *machine __maybe_unused, +int machine__process_switch_event(struct machine *machine, union perf_event *event); int machine__process_mmap_event(struct machine *machine, union perf_event *event, struct perf_sample *sample); |