2012-05-18 17:18:07

by Anna-Maria Gleixner

Subject: [patch 05/24] blackfin: Use generic time config

Use seperate selector for clockevents.

Signed-off-by: Anna-Maria Gleixner <[email protected]>
Cc: Mike Frysinger <[email protected]>
---
arch/blackfin/Kconfig | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

Index: linux/arch/blackfin/Kconfig
===================================================================
--- linux.orig/arch/blackfin/Kconfig
+++ linux/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"

2012-05-21 09:11:27

by Anna-Maria Gleixner

Subject: [tip:timers/core] blackfin: Use generic time config

Commit-ID: dfbaec06bd80117f8ed944236efab8fb32cd4f68
Gitweb: http://git.kernel.org/tip/dfbaec06bd80117f8ed944236efab8fb32cd4f68
Author: Anna-Maria Gleixner <[email protected]>
AuthorDate: Fri, 18 May 2012 16:45:45 +0000
Committer: Thomas Gleixner <[email protected]>
CommitDate: Mon, 21 May 2012 11:01:41 +0200

blackfin: Use generic time config

Use seperate selector for clockevents.

Signed-off-by: Anna-Maria Gleixner <[email protected]>
Cc: Mike Frysinger <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>

---
arch/blackfin/Kconfig | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 373a690..bc21de2 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"