From 830fe3490c04041a0608dd09d43e8e73f3c7d161 Mon Sep 17 00:00:00 2001 From: Anna-Maria Gleixner Date: Fri, 18 May 2012 16:45:53 +0000 Subject: [PATCH] --- yaml --- r: 307610 b: refs/heads/master c: 8cf200d8d01e71e8708a883a9cd0439cda6c2432 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/Kconfig | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index a170fa228d22..6454089539ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43229d1e0976e42069cbc8cab99273183becd0ec +refs/heads/master: 8cf200d8d01e71e8708a883a9cd0439cda6c2432 diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig index ff9e033ce626..cffd8b0082d5 100644 --- a/trunk/arch/sh/Kconfig +++ b/trunk/arch/sh/Kconfig @@ -28,6 +28,8 @@ config SUPERH select RTC_LIB select GENERIC_ATOMIC64 select GENERIC_IRQ_SHOW + select GENERIC_CLOCKEVENTS + select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST help The SuperH is a RISC processor targeted for use in embedded systems and consumer electronics; it was also used in the Sega Dreamcast @@ -86,16 +88,6 @@ config GENERIC_GPIO config GENERIC_CALIBRATE_DELAY bool -config GENERIC_CLOCKEVENTS - def_bool y - -config GENERIC_CLOCKEVENTS_BROADCAST - bool - -config GENERIC_CMOS_UPDATE - def_bool y - depends on SH_SH03 || SH_DREAMCAST - config GENERIC_LOCKBREAK def_bool y depends on SMP && PREEMPT