[tip:timers/core] score: Use generic time config

tip-bot for Anna-Maria Gleixner
2012-05-21T09:22:51Z

Commit-ID: 43229d1e0976e42069cbc8cab99273183becd0ec
Gitweb: http://git.kernel.org/tip/43229d1e0976e42069cbc8cab99273183becd0ec
Author: Anna-Maria Gleixner <anna-maria@glx-um.de>
AuthorDate: Fri, 18 May 2012 16:45:52 +0000
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 21 May 2012 11:01:44 +0200

score: Use generic time config

Signed-off-by: Anna-Maria Gleixner <anna-maria@glx-um.de>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Link: http://lkml.kernel.org/r/20120518163106.727602709@glx-um.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/score/Kconfig | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index 4b28577..f5d3b32 100644
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -9,6 +9,7 @@ config SCORE
select HAVE_MEMBLOCK_NODE_MAP
select ARCH_DISCARD_MEMBLOCK
select GENERIC_CPU_DEVICES
+ select GENERIC_CLOCKEVENTS

choice
prompt "System type"
@@ -51,9 +52,6 @@ config GENERIC_HWEIGHT
config GENERIC_CALIBRATE_DELAY
def_bool y

-config GENERIC_CLOCKEVENTS
- def_bool y
-
menu "Kernel type"

config 32BIT