From 7a502b18b5a76be84e6b2fa56df5f66b878eb86c Mon Sep 17 00:00:00 2001
From: Max Filippov <jcmvbkbc@gmail.com>
Date: Mon, 17 Sep 2012 05:44:43 +0400
Subject: [PATCH] --- yaml --- r: 332311 b: refs/heads/master c:
 fa48cf426926289643b8f35479ba2ff369d4750e h: refs/heads/master i:   332309:
 e465f0daea5d17279b7867b5a2ea60d2300618f6   332307:
 2f0f859707bae4bf2ea3c37761fbe15d1420278c   332303:
 fc114b693655ae521c2f4dd2e9d1e6ab06372f56 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/xtensa/kernel/platform.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 347aa08d8795..78836c5a91aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ed65f3748c249ba420e60a8ed93670f452256cf
+refs/heads/master: fa48cf426926289643b8f35479ba2ff369d4750e
diff --git a/trunk/arch/xtensa/kernel/platform.c b/trunk/arch/xtensa/kernel/platform.c
index 1b91a97f1d84..97230e46cbe7 100644
--- a/trunk/arch/xtensa/kernel/platform.c
+++ b/trunk/arch/xtensa/kernel/platform.c
@@ -40,8 +40,8 @@ _F(int,  pcibios_fixup, (void), { return 0; });
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
 _F(void, calibrate_ccount, (void),
 {
-  printk ("ERROR: Cannot calibrate cpu frequency! Assuming 100MHz.\n");
-  ccount_per_jiffy = 100 * (1000000UL/HZ);
+	pr_err("ERROR: Cannot calibrate cpu frequency! Assuming 10MHz.\n");
+	ccount_per_jiffy = 10 * (1000000UL/HZ);
 });
 #endif