From bfe94c23c79cf607d75f62b1c7dab8adddf8458c Mon Sep 17 00:00:00 2001 From: Anna-Maria Gleixner Date: Fri, 18 May 2012 16:45:52 +0000 Subject: [PATCH] --- yaml --- r: 307609 b: refs/heads/master c: 43229d1e0976e42069cbc8cab99273183becd0ec h: refs/heads/master i: 307607: bdf4591019285b67c09d92657c33ff40ec979e17 v: v3 --- [refs] | 2 +- trunk/arch/score/Kconfig | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b7ff6a86a760..a170fa228d22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6527b92e40f48b29c31be911c3d62eec484cf70 +refs/heads/master: 43229d1e0976e42069cbc8cab99273183becd0ec diff --git a/trunk/arch/score/Kconfig b/trunk/arch/score/Kconfig index 4b285779ac05..f5d3b3237419 100644 --- a/trunk/arch/score/Kconfig +++ b/trunk/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