Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	include/linux/mod_devicetable.h
	scripts/mod/file2alias.c

1 files changed, 4 insertions, 4 deletions

diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c
index 215b584007b1..6d5a8a7faf48 100644
--- a/tools/perf/builtin-help.c
+++ b/tools/perf/builtin-help.c
@@ -29,14 +29,14 @@ enum help_format {
         HELP_FORMAT_WEB,
 };
 
-static int show_all = 0;
+static bool show_all = false;
 static enum help_format help_format = HELP_FORMAT_MAN;
 static struct option builtin_help_options[] = {
         OPT_BOOLEAN('a', "all", &show_all, "print all available commands"),
-        OPT_SET_INT('m', "man", &help_format, "show man page", HELP_FORMAT_MAN),
-        OPT_SET_INT('w', "web", &help_format, "show manual in web browser",
+        OPT_SET_UINT('m', "man", &help_format, "show man page", HELP_FORMAT_MAN),
+        OPT_SET_UINT('w', "web", &help_format, "show manual in web browser",
                         HELP_FORMAT_WEB),
-        OPT_SET_INT('i', "info", &help_format, "show info page",
+        OPT_SET_UINT('i', "info", &help_format, "show info page",
                         HELP_FORMAT_INFO),
         OPT_END(),
 };