From 650de985dde38283c2c8506da14bfb7665f3bd27 Mon Sep 17 00:00:00 2001
From: Brice Goglin <Brice.Goglin@inria.fr>
Date: Fri, 7 Aug 2009 10:18:39 +0200
Subject: [PATCH] --- yaml --- r: 156623 b: refs/heads/master c:
 b26bc5a7f81474937e427b0c855eabee5ad56f89 h: refs/heads/master i:   156621:
 e0de6ec6f67dd1ed4d56e0bb01e9b1d1952bb076   156619:
 d6f8885a29660f8494313179002afea530255fb7   156615:
 8537c7ace6bf211ebab465d0f9731eaf34a9e062   156607:
 8a41e2ab29a54e11021e807064d6315145cb107e v: v3

---
 [refs]                                       | 2 +-
 trunk/tools/perf/Documentation/perf-stat.txt | 2 +-
 trunk/tools/perf/builtin-stat.c              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0be2031cbf9c..43549af4d22a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94cb9e385d5b4d55a5ae389baa10ad2835ea39bb
+refs/heads/master: b26bc5a7f81474937e427b0c855eabee5ad56f89
diff --git a/trunk/tools/perf/Documentation/perf-stat.txt b/trunk/tools/perf/Documentation/perf-stat.txt
index 0d74346d21ab..484080dd5b6f 100644
--- a/trunk/tools/perf/Documentation/perf-stat.txt
+++ b/trunk/tools/perf/Documentation/perf-stat.txt
@@ -40,7 +40,7 @@ OPTIONS
 -a::
         system-wide collection
 
--S::
+-c::
         scale counter values
 
 EXAMPLES
diff --git a/trunk/tools/perf/builtin-stat.c b/trunk/tools/perf/builtin-stat.c
index f9510eeeb6c7..b4b06c7903e1 100644
--- a/trunk/tools/perf/builtin-stat.c
+++ b/trunk/tools/perf/builtin-stat.c
@@ -496,7 +496,7 @@ static const struct option options[] = {
 		    "stat events on existing pid"),
 	OPT_BOOLEAN('a', "all-cpus", &system_wide,
 		    "system-wide collection from all CPUs"),
-	OPT_BOOLEAN('S', "scale", &scale,
+	OPT_BOOLEAN('c', "scale", &scale,
 		    "scale/normalize counters"),
 	OPT_BOOLEAN('v', "verbose", &verbose,
 		    "be more verbose (show counter open errors, etc)"),