summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesper Juhl2011-05-26 10:21:05 +0200
committerIngo Molnar2011-05-26 13:49:57 +0200
commitea7659fb2b876337aee719d9d5ddb05531dfb334 (patch)
tree899b5d257959d8071b7a9d579c9fb6a8545a77d9
parentMerge branch 'linus' into perf/urgent (diff)
downloadkernel-qcow2-linux-ea7659fb2b876337aee719d9d5ddb05531dfb334.tar.gz
kernel-qcow2-linux-ea7659fb2b876337aee719d9d5ddb05531dfb334.tar.xz
kernel-qcow2-linux-ea7659fb2b876337aee719d9d5ddb05531dfb334.zip
perf: Remove duplicate headers
Signed-off-by: Jesper Juhl <jj@chaosbits.net> Cc: Tom Zanussi <tom.zanussi@linux.intel.com> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Cc: trivial@kernel.org Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Link: http://lkml.kernel.org/r/alpine.LNX.2.00.1105261011290.17400@swampdragon.chaosbits.net Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--tools/perf/builtin-annotate.c2
-rw-r--r--tools/perf/builtin-script.c1
2 files changed, 0 insertions, 3 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"
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 974f6d3f4e53..22747de7234b 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -10,7 +10,6 @@
#include "util/symbol.h"
#include "util/thread.h"
#include "util/trace-event.h"
-#include "util/parse-options.h"
#include "util/util.h"
#include "util/evlist.h"
#include "util/evsel.h"