From: Michel Lespinasse Date: Wed, 10 Oct 2012 22:54:11 +0000 (-0700) Subject: perf: fix duplicate header inclusion X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ec073619cdda99ffb6a07d3b8000569f5210815a;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git perf: fix duplicate header inclusion #include somehow got duplicated on its way to linus's tree (probably as a conflict resolution as things got sent through multiple trees) Signed-off-by: Michel Lespinasse Cc: Adrian Hunter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/tools/perf/util/include/linux/rbtree.h b/tools/perf/util/include/linux/rbtree.h index 9bcdc844b330..2a030c5af3aa 100644 --- a/tools/perf/util/include/linux/rbtree.h +++ b/tools/perf/util/include/linux/rbtree.h @@ -1,3 +1,2 @@ #include -#include #include "../../../../include/linux/rbtree.h"