From 7bfc2de061f5dadf4335d17c8f2460baa6302fc1 Mon Sep 17 00:00:00 2001
From: Akira Takeuchi <takeuchi.akr@jp.panasonic.com>
Date: Wed, 27 Oct 2010 17:28:59 +0100
Subject: [PATCH] --- yaml --- r: 218737 b: refs/heads/master c:
 711beda5cfd91c148cab98c18bded3b8dea52111 h: refs/heads/master i:   218735:
 ed383e5d832dce13af8e3393c42ec9e56ef2ed7a v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/mn10300/configs/asb2303_defconfig | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2f0e77da803f..268c9cd94243 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62747cd27ee241ffa32d501e45980cdc441d4a09
+refs/heads/master: 711beda5cfd91c148cab98c18bded3b8dea52111
diff --git a/trunk/arch/mn10300/configs/asb2303_defconfig b/trunk/arch/mn10300/configs/asb2303_defconfig
index d80dfcb2c902..3f749b69ca71 100644
--- a/trunk/arch/mn10300/configs/asb2303_defconfig
+++ b/trunk/arch/mn10300/configs/asb2303_defconfig
@@ -12,6 +12,8 @@ CONFIG_SLAB=y
 CONFIG_PROFILING=y
 # CONFIG_BLOCK is not set
 CONFIG_PREEMPT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_MN10300_RTC=y
 CONFIG_MN10300_TTYSM_CONSOLE=y
 CONFIG_MN10300_TTYSM0=y