From d803819ac91a7023564cd955766a30a2e1ec5a4f Mon Sep 17 00:00:00 2001 From: Anna-Maria Gleixner Date: Fri, 18 May 2012 16:45:50 +0000 Subject: [PATCH] --- yaml --- r: 307605 b: refs/heads/master c: ea5332098e68e2380429ce8025996fad61ca28a6 h: refs/heads/master i: 307603: 24a1fb940099922521c8cefe1674b74efb3690fa v: v3 --- [refs] | 2 +- trunk/arch/mn10300/Kconfig | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 70742c93e850..4eb5c1327f98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cde1794b069f44ca02f3f4f50a903e9361132244 +refs/heads/master: ea5332098e68e2380429ce8025996fad61ca28a6 diff --git a/trunk/arch/mn10300/Kconfig b/trunk/arch/mn10300/Kconfig index 3aa3de017159..7f78057af2f5 100644 --- a/trunk/arch/mn10300/Kconfig +++ b/trunk/arch/mn10300/Kconfig @@ -6,6 +6,7 @@ config MN10300 select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_KGDB select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER + select GENERIC_CLOCKEVENTS config AM33_2 def_bool n @@ -42,15 +43,9 @@ config RWSEM_XCHGADD_ALGORITHM config GENERIC_CALIBRATE_DELAY def_bool y -config GENERIC_CMOS_UPDATE - def_bool n - config GENERIC_HWEIGHT def_bool y -config GENERIC_CLOCKEVENTS - def_bool y - config GENERIC_BUG def_bool y