[tip:timers/core] um: Use generic time config

tip-bot for Anna-Maria Gleixner
2012-05-21T09:25:58Z

Commit-ID: 875c9d09b5a6400d6882b0e6e828862a73ce739d
Gitweb: http://git.kernel.org/tip/875c9d09b5a6400d6882b0e6e828862a73ce739d
Author: Anna-Maria Gleixner <anna-maria@glx-um.de>
AuthorDate: Fri, 18 May 2012 16:45:55 +0000
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 21 May 2012 11:01:44 +0200

um: Use generic time config

Signed-off-by: Anna-Maria Gleixner <anna-maria@glx-um.de>
Acked-by: Richard Weinberger <richard@nod.at>
Link: http://lkml.kernel.org/r/20120518163107.251597655@glx-um.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/um/Kconfig.common | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index 20a49ba..806185d 100644
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -10,6 +10,7 @@ config UML
select GENERIC_IRQ_SHOW
select GENERIC_CPU_DEVICES
select GENERIC_IO
+ select GENERIC_CLOCKEVENTS

config MMU
bool
@@ -52,10 +53,6 @@ config GENERIC_BUG
default y
depends on BUG

-config GENERIC_CLOCKEVENTS
- bool
- default y
-
# Used in kernel/irq/manage.c and include/linux/irq.h
config IRQ_RELEASE_METHOD
bool