diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 12:58:59 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 12:59:03 +0000 |
commit | d0cdd82c6e0944df733b28f5d4cbbe97298587e4 (patch) | |
tree | 9de205625a4657fedbfae52c65ea017beb7509a8 /tools/perf/util/trace-event-parse.c | |
parent | 747303a383d59a4d4667152fb68293dd9ff06438 (diff) | |
parent | 9418ba306688c0b77a8548b3281ba3d130036516 (diff) |
Merge branch 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into next/fixes-non-critical
* 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6: (247 commits)
ARM: mach-imx: mx3: Fix section mismatch in imx3_init_l2x0()
ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS board
ARM: mach-pcm038: Fix field name of regulator_consumer_supply struct
Also includes an update to v3.3-rc3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'tools/perf/util/trace-event-parse.c')
-rw-r--r-- | tools/perf/util/trace-event-parse.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index 6c164dc9ee95..1a8d4dc4f386 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -21,14 +21,13 @@ * The parts for function graph printing was taken and modified from the * Linux Kernel that were written by Frederic Weisbecker. */ -#define _GNU_SOURCE + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> #include <errno.h> -#undef _GNU_SOURCE #include "../perf.h" #include "util.h" #include "trace-event.h" |