am 05815996: Merge "Added Voltage and Current regulator ftrace events to atrace"

* commit '05815996c965b99c4cc4ea96f6b6c4a9123cdf1c':
  Added Voltage and Current regulator ftrace events to atrace
This commit is contained in:
Chris Craik 2015-05-07 16:34:00 +00:00 committed by Android Git Automerger
commit 9a104951a3

View File

@ -137,6 +137,9 @@ static const TracingCategory k_categories[] = {
{ REQ, "/sys/kernel/debug/tracing/events/vmscan/mm_vmscan_kswapd_wake/enable" },
{ REQ, "/sys/kernel/debug/tracing/events/vmscan/mm_vmscan_kswapd_sleep/enable" },
} },
{ "regulators", "Voltage and Current Regulators", 0, {
{ REQ, "/sys/kernel/debug/tracing/events/regulator/enable" },
} },
};
/* Command line options */