diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-22 09:20:07 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-22 09:20:18 -0500 |
| commit | 2daa79ec2126f8e710391e9d8e8f0d31d7c91d5f (patch) | |
| tree | ab89c74c09c2986fa01c25ad8e45989a48a18899 /tools/perf/builtin-probe.c | |
| parent | 7dae8c5209147ad06d424928a5f1ec45caa87691 (diff) | |
| parent | 678a0222edc9da43a22145d68647500ee85e6c04 (diff) | |
Merge branch 'lpc32xx/drivers' into next/drivers
* lpc32xx/drivers: (566 commits)
ARM: LPC32xx: ADC support for mach-lpc32xx
Includes an update to Linux 3.3-rc4
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'tools/perf/builtin-probe.c')
| -rw-r--r-- | tools/perf/builtin-probe.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c index 59d43abfbfec..fb8566181f27 100644 --- a/tools/perf/builtin-probe.c +++ b/tools/perf/builtin-probe.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 20 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | #define _GNU_SOURCE | ||
| 24 | #include <sys/utsname.h> | 23 | #include <sys/utsname.h> |
| 25 | #include <sys/types.h> | 24 | #include <sys/types.h> |
| 26 | #include <sys/stat.h> | 25 | #include <sys/stat.h> |
| @@ -31,7 +30,6 @@ | |||
| 31 | #include <stdlib.h> | 30 | #include <stdlib.h> |
| 32 | #include <string.h> | 31 | #include <string.h> |
| 33 | 32 | ||
| 34 | #undef _GNU_SOURCE | ||
| 35 | #include "perf.h" | 33 | #include "perf.h" |
| 36 | #include "builtin.h" | 34 | #include "builtin.h" |
| 37 | #include "util/util.h" | 35 | #include "util/util.h" |