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