Merge branch '3.1-fixes-for-rmk' of git://linux-arm.org/linux-2.6-wd into fixes

2011-08-13 09:43:19 +01:00
parent 73e0881d31 72dc53acd5
commit e426f8e39b
6 changed files with 32 additions and 27 deletions
--- a/tools/perf/arch/arm/util/dwarf-regs.c
+++ b/tools/perf/arch/arm/util/dwarf-regs.c
@@ -8,7 +8,10 @@
 * published by the Free Software Foundation.
 */

+#include <stdlib.h>
+#ifndef __UCLIBC__
 #include <libio.h>
+#endif
 #include <dwarf-regs.h>

 struct pt_regs_dwarfnum {