summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnna-Maria Gleixner <anna-maria@glx-um.de>2012-05-18 18:45:45 +0200
committerThomas Gleixner <tglx@linutronix.de>2012-05-21 11:01:41 +0200
commitdfbaec06bd80117f8ed944236efab8fb32cd4f68 (patch)
tree1e6bbfd366350ed18c476a0e66eb8db18ae7702d
parentavr32: Use generic time config (diff)
downloadlinux-dfbaec06bd80117f8ed944236efab8fb32cd4f68.tar.xz
linux-dfbaec06bd80117f8ed944236efab8fb32cd4f68.zip
blackfin: Use generic time config
Use seperate selector for clockevents. Signed-off-by: Anna-Maria Gleixner <anna-maria@glx-um.de> Cc: Mike Frysinger <vapier@gentoo.org> Link: http://lkml.kernel.org/r/20120518163105.026597932@glx-um.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/blackfin/Kconfig8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 373a6902d8fa..bc21de2e8fed 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -37,6 +37,7 @@ config BLACKFIN
select GENERIC_IRQ_PROBE
select IRQ_PER_CPU if SMP
select HAVE_NMI_WATCHDOG if NMI_WATCHDOG
+ select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS
config GENERIC_CSUM
def_bool y
@@ -593,9 +594,10 @@ comment "Kernel Timer/Scheduler"
source kernel/Kconfig.hz
-config GENERIC_CLOCKEVENTS
+config SET_GENERIC_CLOCKEVENTS
bool "Generic clock events"
default y
+ select GENERIC_CLOCKEVENTS
menu "Clock event device"
depends on GENERIC_CLOCKEVENTS
@@ -629,10 +631,6 @@ config GPTMR0_CLOCKSOURCE
depends on !TICKSOURCE_GPTMR0
endmenu
-config ARCH_USES_GETTIMEOFFSET
- depends on !GENERIC_CLOCKEVENTS
- def_bool y
-
source kernel/time/Kconfig
comment "Misc"