diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-15 12:58:54 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-15 12:58:54 (GMT) |
| commit | 7113fe74c10bc01abfdad2fe1f9ca023b0f83685 (patch) | |
| tree | 6b301a39850b9d41acb4bf3084dde2f012a5affc /kernel/trace/power-traces.c | |
| parent | a68d35323b091f51e0957313f0f871f187879143 (diff) | |
| parent | 957d1282bb8c07e682e142b9237cd9fcb8348a0b (diff) | |
| download | linux-7113fe74c10bc01abfdad2fe1f9ca023b0f83685.tar.xz | |
Merge branch 'pm-assorted'
* pm-assorted:
suspend: enable freeze timeout configuration through sys
ACPI: enable ACPI SCI during suspend
PM: Introduce suspend state PM_SUSPEND_FREEZE
PM / Runtime: Add new helper function: pm_runtime_active()
PM / tracing: remove deprecated power trace API
PM: don't use [delayed_]work_pending()
PM / Domains: don't use [delayed_]work_pending()
Diffstat (limited to 'kernel/trace/power-traces.c')
| -rw-r--r-- | kernel/trace/power-traces.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/trace/power-traces.c b/kernel/trace/power-traces.c index f55fcf6..1c71382 100644 --- a/kernel/trace/power-traces.c +++ b/kernel/trace/power-traces.c @@ -13,8 +13,5 @@ #define CREATE_TRACE_POINTS #include <trace/events/power.h> -#ifdef EVENT_POWER_TRACING_DEPRECATED -EXPORT_TRACEPOINT_SYMBOL_GPL(power_start); -#endif EXPORT_TRACEPOINT_SYMBOL_GPL(cpu_idle); |