diff --git a/[refs] b/[refs] index 4eded9faedb6..65eb33d01253 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff582680f8762293aa45eb5cf2faacadbe73b435 +refs/heads/master: 1aa3d1780f518080e6a51a5288cd05fb4b34d82c diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile index e18163bb32d7..6aef6d00e3c2 100644 --- a/trunk/tools/perf/Makefile +++ b/trunk/tools/perf/Makefile @@ -534,9 +534,6 @@ ifneq ($(MAKECMDGOALS),tags) # because maintaining the nesting to match is a pain. If # we had "elif" things would have been much nicer... --include config.mak.autogen --include config.mak - ifdef NO_LIBELF NO_DWARF := 1 NO_DEMANGLE := 1