From 787d4245729299f5eda7ea4988c973951c649ba7 Mon Sep 17 00:00:00 2001
From: Oskar Schirmer <os@emlix.com>
Date: Mon, 11 May 2009 15:43:37 +0200
Subject: [PATCH] --- yaml --- r: 144923 b: refs/heads/master c:
 866e514d6a584810dc3ae25364f823b890b7d312 h: refs/heads/master i:   144921:
 31ea24b5b07812a00a15514460b4134f23c0ba02   144919:
 3ad5319327eb1f076de17c9ad03f6fd58e987e2a v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/xtensa/configs/s6105_defconfig | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cd47cbcb1c05..e0cd1639d9bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b070a03f6490b0ac8d95c51b55a64e433d9160ab
+refs/heads/master: 866e514d6a584810dc3ae25364f823b890b7d312
diff --git a/trunk/arch/xtensa/configs/s6105_defconfig b/trunk/arch/xtensa/configs/s6105_defconfig
index 6e1deff41590..768bee006037 100644
--- a/trunk/arch/xtensa/configs/s6105_defconfig
+++ b/trunk/arch/xtensa/configs/s6105_defconfig
@@ -115,7 +115,7 @@ CONFIG_XTENSA_VARIANT_S6000=y
 CONFIG_PREEMPT=y
 # CONFIG_MATH_EMULATION is not set
 # CONFIG_HIGHMEM is not set
-# CONFIG_XTENSA_CALIBRATE_CCOUNT is not set
+CONFIG_XTENSA_CALIBRATE_CCOUNT=y
 CONFIG_SERIAL_CONSOLE=y
 # CONFIG_XTENSA_ISS_NETWORK is not set
 
@@ -131,7 +131,6 @@ CONFIG_SERIAL_CONSOLE=y
 # CONFIG_XTENSA_PLATFORM_ISS is not set
 # CONFIG_XTENSA_PLATFORM_XT2000 is not set
 CONFIG_XTENSA_PLATFORM_S6105=y
-CONFIG_XTENSA_CPU_CLOCK=300
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttyS1,38400 debug bootmem_debug loglevel=7"