diff options
| author | Anna-Maria Gleixner <anna-maria@glx-um.de> | 2012-05-18 12:45:45 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-21 05:01:41 -0400 |
| commit | dfbaec06bd80117f8ed944236efab8fb32cd4f68 (patch) | |
| tree | 1e6bbfd366350ed18c476a0e66eb8db18ae7702d | |
| parent | 8d6af9914cacfbb60537cf5c46f9ebfc26ff2440 (diff) | |
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/Kconfig | 8 |
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 | |||
| 37 | select GENERIC_IRQ_PROBE | 37 | select GENERIC_IRQ_PROBE |
| 38 | select IRQ_PER_CPU if SMP | 38 | select IRQ_PER_CPU if SMP |
| 39 | select HAVE_NMI_WATCHDOG if NMI_WATCHDOG | 39 | select HAVE_NMI_WATCHDOG if NMI_WATCHDOG |
| 40 | select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS | ||
| 40 | 41 | ||
| 41 | config GENERIC_CSUM | 42 | config GENERIC_CSUM |
| 42 | def_bool y | 43 | def_bool y |
| @@ -593,9 +594,10 @@ comment "Kernel Timer/Scheduler" | |||
| 593 | 594 | ||
| 594 | source kernel/Kconfig.hz | 595 | source kernel/Kconfig.hz |
| 595 | 596 | ||
| 596 | config GENERIC_CLOCKEVENTS | 597 | config SET_GENERIC_CLOCKEVENTS |
| 597 | bool "Generic clock events" | 598 | bool "Generic clock events" |
| 598 | default y | 599 | default y |
| 600 | select GENERIC_CLOCKEVENTS | ||
| 599 | 601 | ||
| 600 | menu "Clock event device" | 602 | menu "Clock event device" |
| 601 | depends on GENERIC_CLOCKEVENTS | 603 | depends on GENERIC_CLOCKEVENTS |
| @@ -629,10 +631,6 @@ config GPTMR0_CLOCKSOURCE | |||
| 629 | depends on !TICKSOURCE_GPTMR0 | 631 | depends on !TICKSOURCE_GPTMR0 |
| 630 | endmenu | 632 | endmenu |
| 631 | 633 | ||
| 632 | config ARCH_USES_GETTIMEOFFSET | ||
| 633 | depends on !GENERIC_CLOCKEVENTS | ||
| 634 | def_bool y | ||
| 635 | |||
| 636 | source kernel/time/Kconfig | 634 | source kernel/time/Kconfig |
| 637 | 635 | ||
| 638 | comment "Misc" | 636 | comment "Misc" |
