diff --git a/[refs] b/[refs] index 1ca20961a063..e9276c6bbcca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b326e9560a28fc3e950637ef51847ed8f05c1335 +refs/heads/master: c0dfb2feb632537cf0a9d2ce3c29bcf5778fec59 diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h index d2f2667430da..89098e35a036 100644 --- a/trunk/include/linux/perf_event.h +++ b/trunk/include/linux/perf_event.h @@ -567,7 +567,6 @@ struct perf_pending_entry { struct perf_sample_data; -typedef void (*perf_callback_t)(struct perf_event *, void *); typedef void (*perf_overflow_handler_t)(struct perf_event *, int, struct perf_sample_data *, struct pt_regs *regs); @@ -669,8 +668,6 @@ struct perf_event { struct event_filter *filter; #endif - perf_callback_t callback; - #endif /* CONFIG_PERF_EVENTS */ };