aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-annotate.c
diff options
context:
space:
mode:
authorIngo Molnar <[email protected]>2011-06-04 10:13:06 +0000
committerIngo Molnar <[email protected]>2011-06-04 10:13:06 +0000
commit710054ba25c0d1f8f41c22ce13ba336503fb5318 (patch)
treef9b09b722bf511841539173d946f90a20fc2e59a /tools/perf/builtin-annotate.c
parentperf, cgroups: Fix up for new API (diff)
parentperf python: Fix argument name list of read_on_cpu() (diff)
downloadkernel-710054ba25c0d1f8f41c22ce13ba336503fb5318.tar.gz
kernel-710054ba25c0d1f8f41c22ce13ba336503fb5318.zip
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Diffstat (limited to 'tools/perf/builtin-annotate.c')
-rw-r--r--tools/perf/builtin-annotate.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index e18eb7ed30ae..7b139e1e7e86 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -8,8 +8,6 @@
#include "builtin.h"
#include "util/util.h"
-
-#include "util/util.h"
#include "util/color.h"
#include <linux/list.h>
#include "util/cache.h"