diff options
author | Tony Lindgren <tony@atomide.com> | 2013-10-10 18:43:32 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-10-10 18:43:32 -0400 |
commit | f1ca2218881eee7a6f7c9659b837a4c412f8fd06 (patch) | |
tree | d7a0c9fd32fcba2b523d55799533bc835d4c7ac9 /tools/perf/builtin-script.c | |
parent | 68a531a1dec12708817552dad4eefc5968dd333f (diff) | |
parent | dc7743aa3c49fabbc6dc9edbcf7df74d776ac32e (diff) |
Merge tag 'pinctrl-single-for-linus-for-v3.13-signed' into omap-for-v3.13/quirk
Changes to pinctrl-single to allow handling the wake-up
interrupts that most omaps have in each pinctrl register.
As I need these merged also into the omap tree, it was
agreed that I set them up into a separate branch for
both pinctrl tree and linux-omap tree to merge as needed.
Diffstat (limited to 'tools/perf/builtin-script.c')
-rw-r--r-- | tools/perf/builtin-script.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 7f31a3ded1b6..9c333ff3dfeb 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c | |||
@@ -553,8 +553,6 @@ static struct perf_tool perf_script = { | |||
553 | .ordering_requires_timestamps = true, | 553 | .ordering_requires_timestamps = true, |
554 | }; | 554 | }; |
555 | 555 | ||
556 | extern volatile int session_done; | ||
557 | |||
558 | static void sig_handler(int sig __maybe_unused) | 556 | static void sig_handler(int sig __maybe_unused) |
559 | { | 557 | { |
560 | session_done = 1; | 558 | session_done = 1; |